Commit Graph

42395 Commits

Author SHA1 Message Date
Lin c08f90a3eb Merge pull request #14566 from TheObserver-sys/CabbageFix
Botany Pass 3: THE CABBAGE PATCH PEOPLE MUST DIE.
2021-04-05 16:07:30 -05:00
CitadelStationBot 548f017a2b Automatic changelog generation for PR #14567 [ci skip] 2021-04-05 11:37:10 -05:00
Lin 462486e39d Merge pull request #14567 from Putnam3145/bad-copypasta
fixes forced climax causing a climax-with
2021-04-05 11:37:07 -05:00
CitadelStationBot fa1cdb20b6 Automatic changelog generation for PR #14547 [ci skip] 2021-04-04 23:22:43 -05:00
Lin c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops
Fixing some issues for laptops and lockers/crates.
2021-04-04 23:22:41 -05:00
CitadelStationBot 72ec59ca79 Automatic changelog generation for PR #14565 [ci skip] 2021-04-04 23:18:58 -05:00
Lin 05ae354d87 Merge pull request #14565 from DeltaFire15/wood-pack-correction
Corrects the wood plank crate's name and description
2021-04-04 23:18:55 -05:00
Putnam a9d73424d6 fixes a bad copypasta 2021-04-04 00:10:06 -07:00
Changelogs 2c230c6490 Automatic changelog compile [ci skip] 2021-04-04 00:12:20 +00:00
DrPainis 29451ee9ae organic repair surgery can be done on a cyborg torso (#14435)
* repair surgery can be done on a cyborg torso

because no

* uuuuhhhh Silicons asked me to do this

* no organic repair surgery on robots
2021-04-04 00:18:43 +02:00
CitadelStationBot 11e3c1864e Automatic changelog generation for PR #14564 [ci skip] 2021-04-03 17:12:54 -05:00
Hatterhat 8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
DeltaFire 1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
Changelogs a9b0676f73 Automatic changelog compile [ci skip] 2021-04-03 00:06:57 +00:00
The0bserver 989fb101f0 No more Human Harvests! 2021-04-02 20:05:50 -04:00
The0bserver 976ca8b48b Merge remote-tracking branch 'Upstream/master' 2021-04-02 19:57:41 -04:00
CitadelStationBot daba531fea Automatic changelog generation for PR #14539 [ci skip] 2021-04-02 12:48:58 -05:00
Putnam3145 e509f1956d Removed cloning destroy; removed commented-out objs (#14539) 2021-04-02 19:48:55 +02:00
CitadelStationBot 82b58ea5fe Automatic changelog generation for PR #14558 [ci skip] 2021-04-02 12:44:25 -05:00
DeltaFire b7eac4b8bb Merge pull request #14558 from BlueWildrose/buckbumble
Bumbles no longer has a number beside their name
2021-04-02 19:44:23 +02:00
CitadelStationBot 87b20dc22e Automatic changelog generation for PR #14542 [ci skip] 2021-04-02 12:42:43 -05:00
DeltaFire dd8c5e97f1 Merge pull request #14542 from Putnam3145/observe-log
Added observe logging
2021-04-02 19:42:41 +02:00
Changelogs bfdfa96585 Automatic changelog compile [ci skip] 2021-04-02 00:12:57 +00:00
Blue Wildrose f1ef779e58 Bumbles no longer has a number beside their name 2021-04-01 16:53:47 -07:00
Blue Wildrose 4de7af5db5 Bumbles no longer has a number beside their name 2021-04-01 16:31:15 -07:00
CitadelStationBot d614a1561c Automatic changelog generation for PR #14541 [ci skip] 2021-04-01 14:04:19 -05:00
Lin 0107fb113d Merge pull request #14541 from LetterN/comms-please
You can now pay pirates again
2021-04-01 14:04:17 -05:00
Changelogs bbde44746c Automatic changelog compile [ci skip] 2021-04-01 00:07:06 +00:00
The0bserver 270f6fe85f Merge remote-tracking branch 'Upstream/master' 2021-03-31 14:33:09 -04:00
SandPoot 2381db5f53 upload files 2021-03-31 12:35:43 -03:00
Putnam 3760be44d9 Added observe logging 2021-03-30 20:41:48 -07:00
LetterN 74c00d17f8 let's be [redacted], its really in t his year 2021-03-31 09:43:15 +08:00
Changelogs 8bee5004ba Automatic changelog compile [ci skip] 2021-03-31 00:05:24 +00:00
Changelogs b4ec612b4e Automatic changelog compile [ci skip] 2021-03-29 00:07:03 +00:00
CitadelStationBot 2074166772 Automatic changelog generation for PR #14431 [ci skip] 2021-03-28 18:09:40 -05:00
Lin 0f5d5522b0 Merge pull request #14431 from YakumoChen/ancient-bundle
Ports Ancient bundle from TG
2021-03-28 18:09:38 -05:00
Lin 130a76677b Merge pull request #14527 from LetterN/yay-nullspace
Fixes order-of-nullspacing boards
2021-03-28 18:03:18 -05:00
CitadelStationBot 2cc5658afd Automatic changelog generation for PR #14528 [ci skip] 2021-03-28 18:02:51 -05:00
Lin c4f2267fd0 Merge pull request #14528 from BlueWildrose/Idungoofed
Fixed being unable to fix suit sensors if damaged at all unless destroyed completely
2021-03-28 18:02:49 -05:00
CitadelStationBot e4cbb44075 Automatic changelog generation for PR #14533 [ci skip] 2021-03-28 14:53:41 -05:00
DeltaFire ee7357c328 Merge pull request #14533 from Citadel-Station-13/silicons-patch-12
fixes automatic hydroponics system design spitting out the machine rather than board
2021-03-28 21:53:39 +02:00
silicons 2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff
Allows borgs to move pulled stuff around like a human
2021-03-28 13:48:14 -06:00
silicons b6b62e84bc Update machine_designs_service.dm 2021-03-28 12:47:22 -07:00
CitadelStationBot 5256d5cfda Automatic changelog generation for PR #14519 [ci skip] 2021-03-28 14:45:07 -05:00
silicons ef43b566f3 Merge pull request #14519 from qweq12yt/improvs-and-contraband
Black Market - Some tweaks, additions and comments
2021-03-28 13:45:05 -06:00
Changelogs a7b41e2dbc Automatic changelog compile [ci skip] 2021-03-28 00:06:45 +00:00
qweq12yt ae39ba3cca ok multiples of 5 tho 2021-03-27 11:38:58 -03:00
qweq12yt afa68172ee less smoke bombs
because maybe it would be abused too much?
2021-03-27 11:36:52 -03:00
qweq12yt 85cad7b51a Merge branch 'master' into improvs-and-contraband 2021-03-27 11:33:01 -03:00
CitadelStationBot e7fdf9b274 Automatic changelog generation for PR #14440 [ci skip] 2021-03-27 02:38:09 -05:00