Commit graph

1805 commits

Author SHA1 Message Date
Leon Friedrich
33f5294e2a Power Cell Refactor (#5943)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-05 15:39:29 +03:00
Morbo
33b0ebd504
Merge branch 'space-wizards:master' into master 2022-01-05 04:24:58 +03:00
wrexbe
4571dca1eb
Tiles Name->ID, DisplayName->Name (#5991) 2022-01-04 17:26:07 -07:00
Peptide90
45a1e57ee4
Quick fixes (firefightercrate fill and rollerbed size) (#6029) 2022-01-04 17:25:51 -07:00
Peptide90
ace591117f
Removed more copyright materials (bar signs) (#5984) 2022-01-05 00:56:40 +11:00
Michael Phillips
b36c9395d6
Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
LittleBuilderJane
66deacc322
New Game Map: Reach Transport Shuttle (#5671)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-05 00:36:37 +11:00
LittleBuilderJane
93cdda6cb4
New Spawnable Map: Boarding Shuttle Dart (#5728) 2022-01-05 00:23:12 +11:00
Arthur
6246bc3829 Merge remote-tracking branch 'upstream/master' 2022-01-04 16:04:26 +03:00
Rane
9603e47096
Added difficulty overrides for several traitor objectives (#6018) 2022-01-04 13:05:05 +01:00
mirrorcult
5249ea057a
Kill bobby 2.0 (#6023) 2022-01-04 10:17:39 +01:00
Arthur
a0d2ea8284 Merge remote-tracking branch 'upstream/master' 2022-01-04 02:02:28 +03:00
Rane
b73f8918f7
Fire & Air Alarm Electronics now constructable (#6015) 2022-01-03 14:32:28 -07:00
Morbo
7fa5226713
Merge branch 'space-wizards:master' into master 2022-01-03 20:29:11 +03:00
mirrorcult
72dcef4203
Reduce locker/crate hp and resistances, add spear wielding (#6001) 2022-01-03 10:53:09 +01:00
ZeroDayDaemon
b45bd3b396
Adds Ducks (#5997)
* Add Ducks

* Update cargo_livestock.yml
2022-01-02 23:47:35 -08:00
Rane
8049be06ad
Tweaks doctor and CMO starting items (#6007) 2022-01-02 23:38:37 -08:00
T-Stalker
70209f5895
Weh! (#6005) 2022-01-02 22:51:42 -07:00
Morbo
40de02cbb5
Merge branch 'space-wizards:master' into master 2022-01-02 09:10:27 +03:00
Lamrr
85297d11b6
Changes tile crafting recipe to make four floor tiles per unit of material used. (#5993) 2022-01-01 22:57:46 -07:00
Delete69
a09509b385
Small Bar Salvage (#5936) 2022-01-02 16:40:44 +11:00
Neith
b8b1bb45b2
Added a new salvage map depicting an emergency shuttle. (#5949) 2022-01-02 16:39:44 +11:00
Flipp Syder
b1584793bf
Adds fire/air alarms (#5018)
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: E F R <602406+Efruit@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-02 15:56:24 +11:00
Morbo
9509d94bbf
Merge branch 'space-wizards:master' into master 2022-01-02 03:29:23 +03:00
Charlese2
02ea48330c
Lower the damage of flash bullets and make the damage blunt. (#5932)
* Lower the damage of flash bullets and make the damage blunt.

* Shotgun flash bullets still do a lot of damage

* Make base flash bullet blunt to match the others.
2022-01-01 23:54:43 +01:00
Morbo
c29c89fa22
Merge branch 'space-wizards:master' into master 2022-01-02 01:26:00 +03:00
Rane
f186ffe571
Added filled wardrobes for most jobs (#5946)
* Added filled wardrobes for most jobs

* Updated based on feedback from mirrorcult

* Readded accidentally deleted cult helmet and maybe test won't fail now 🙏

* Added PietyVend

* Fixed stray pixel

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2022-01-01 18:08:57 +01:00
Rane
ab28be3c54
Adjusted traitor steal objectives (#5974)
* Adjusted traitor steal objectives

* Added theft target to cargo
2022-01-01 17:56:25 +01:00
Peptide90
f88358a12a
Substations now explode when destroyed (#5729)
* Substation destructible component

Substations now explode and create a destroyed machine which can be deconstructed.

* construction graph test failed

Does not need a path from start to finish but adding anyway to fix tests

* railing to structures

* Fixed Review

Updated parent to fix most comments.
Updated node to camelcase

* Updated target node graph

Still recovering...

* Final fix of graph

I swear

* Altered destroyed machine spawns

Removed HV cable and reduced steel sheets.
2022-01-01 17:51:56 +01:00
Morbo
8a991c1ae8
Merge pull request #22 from space-wizards/master
[AUTO] Fork Sync
2022-01-01 18:45:26 +03:00
Kara D
995f9b20f4
Uncomment singularity rads 2021-12-31 20:26:40 -07:00
Arthur
8c2e71e0f3 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_service.yml
#	Resources/Prototypes/Catalog/Fills/Crates/service.yml
2021-12-31 19:24:05 +03:00
Michael Phillips
d164229637
Minor fixes to bodybag handling and fixes #5955 (#5962) 2021-12-31 01:19:42 -07:00
Fishfish458
2aad04ccb9
Cardboard box, weight changes, bureaucracy crate (#5903)
Co-authored-by: fishfish458 <fishfish458>
2021-12-30 19:28:38 -07:00
Rane
c5ce019764
Containers with access readers have properly restrictive access (#5927) 2021-12-30 19:27:28 -07:00
Morbo
c1a1c0ef29
Merge branch 'space-wizards:master' into master 2021-12-31 04:04:14 +03:00
Paul Ritter
512d6a38c3
get that crap outta here (completely rewrites inventorysystem) (#5807)
* some work

* equip: done
unequip: todo

* unequipping done & refactored events

* workin

* movin

* reee namespaces

* stun

* mobstate

* fixes

* some work on events

* removes serverside itemcomp & misc fixes

* work

* smol merge fix

* ports template to prototype & finishes ui

* moves relay & adds containerenumerator

* actions & cuffs

* my god what is actioncode

* more fixes

* im loosing my grasp on reality

* more fixes

* more work

* explosions

* yes

* more work

* more fixes

* merge master & misc fixed because i forgot to commit before merging master

* more fixes

* fixes

* moar

* more work

* moar fixes

* suffixmap

* more work on client

* motivation low

* no. no containers

* mirroring client to server

* fixes

* move serverinvcomp

* serverinventorycomponent is dead

* gaming

* only strippable & ai left...

* only ai and richtext left

* fixes ai

* fixes

* fixes sprite layers

* more fixes

* resolves optional

* yes

* stable™️

* fixes

* moar fixes

* moar

* fix some tests

* lmao

* no comment

* good to merge™️

* fixes build but for real

* adresses some reviews

* adresses some more reviews

* nullables, yo

* fixes lobbyscreen

* timid refactor to differentiate actor & target

* adresses more reviews

* more

* my god what a mess

* removed the rest of duplicates

* removed duplicate slotflags and renamed shoes to feet

* removes another unused one

* yes

* fixes lobby & makes tryunequip return unequipped item

* fixes

* some funny renames

* fixes

* misc improvements to attemptevents

* fixes

* merge fixes

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
Rane
2466e4bdf3
The reagent grinder is now constructable (#5925) 2021-12-30 19:07:14 +01:00
Vera Aguilera Puerto
c9ac29b8dc Fixes holoparasite injector being usable on anything 2021-12-30 11:55:22 +01:00
Morbo
3e01be2fa7
Merge branch 'space-wizards:master' into master 2021-12-30 06:11:11 +03:00
Leon Friedrich
2a7c84a8dd
Fix some lathe recipes (#5941) 2021-12-30 01:19:49 +11:00
metalgearsloth
88bdf0ce61
Add some more prototype serializers (#5934) 2021-12-30 00:48:18 +11:00
Morbo
62fca1fe07
Merge branch 'space-wizards:master' into master 2021-12-29 15:27:56 +03:00
AJCM-git
45bfc0b96b
Adds posters (for mapping) (#5812) 2021-12-29 20:24:51 +11:00
Rane
dc4b549b90
Pill Canister Tweaks (#5928) 2021-12-29 17:21:17 +11:00
Alex Evgrashin
1705eae96c
Suit sensor and crew monitoring (#5521)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-12-29 16:19:00 +11:00
metalgearsloth
e5e144d99c
Rollerbeds (#5681) 2021-12-29 15:57:20 +11:00
CrudeWax
299c4be328
Guardians (Holoparasites) (#5140)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-12-29 14:58:48 +11:00
Morbo
7339c42b23
Merge branch 'space-wizards:master' into master 2021-12-29 06:05:28 +03:00
Rane
3d099998a4
Fixed empty chaplain backpack [1 LINE] (#5926) 2021-12-29 13:48:58 +11:00