Commit Graph

38049 Commits

Author SHA1 Message Date
CitadelStationBot 20e2c030dc Automatic changelog generation for PR #13399 [ci skip] 2020-09-19 08:04:51 -05:00
Ghom 868e464b40 fixes linter issues, removes acid degrading armor (#13399)
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
2020-09-19 15:04:48 +02:00
Putnam3145 e52ba8d883 Merge pull request #13406 from Citadel-Station-13/silicons-patch-39
fixes airlock wire runtimes from non-user wire damage
2020-09-19 06:04:31 -07:00
CitadelStationBot 3d2afcae42 Automatic changelog generation for PR #13394 [ci skip] 2020-09-19 08:02:36 -05:00
silicons 54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
CitadelStationBot b4f383df6d Automatic changelog generation for PR #13401 [ci skip] 2020-09-19 07:59:12 -05:00
silicons 994a0e66e2 Merge pull request #13401 from MrJWhit/chess-sprite-update
Porting new chess sprites
2020-09-19 05:59:08 -07:00
deathride58 6956266013 Merge pull request #13404 from Citadel-Station-13/Donatorfix
Hopefully fixes icon overlay issue for the halo
2020-09-18 18:19:10 -04:00
silicons b9315c5080 Update airlock.dm 2020-09-18 04:26:22 -07:00
Jay a82dc79dbb Hopefully fixes icon overlay issue for the halo 2020-09-18 00:51:59 -05:00
Changelogs 8b309a0cac Automatic changelog compile [ci skip] 2020-09-18 00:14:43 +00:00
silicons 3629addf0f Update ticketmachine.dm 2020-09-17 04:37:10 -07:00
silicons 872ef07b43 Update brawn.dm 2020-09-17 04:36:39 -07:00
Changelogs f390bb620e Automatic changelog compile [ci skip] 2020-09-17 00:14:22 +00:00
MrJWhit a4763bd8c6 Port'n stuff 2020-09-16 10:56:34 -04:00
CitadelStationBot ff796d3383 Automatic changelog generation for PR #13255 [ci skip] 2020-09-16 02:31:22 -05:00
silicons ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
CitadelStationBot 604020c4bc Automatic changelog generation for PR #13388 [ci skip] 2020-09-15 19:31:21 -05:00
silicons 7f145b7948 Merge pull request #13388 from DeltaFire15/plush-ling
Adds peculiar plushies, which are made by failing to make plushmium
2020-09-15 17:31:18 -07:00
CitadelStationBot e0b01d4860 Automatic changelog generation for PR #13387 [ci skip] 2020-09-15 19:31:07 -05:00
silicons 1eb5db1c21 Merge pull request #13387 from MrJWhit/new-brain-damage-line
New Brain Damage Line
2020-09-15 17:31:04 -07:00
CitadelStationBot 4796be71ab Automatic changelog generation for PR #13362 [ci skip] 2020-09-15 19:30:49 -05:00
silicons 39d3a4f596 Merge pull request #13362 from Putnam3145/fix-fuid-production
Fixes organ fluid production.
2020-09-15 17:30:46 -07:00
CitadelStationBot 47276120dd Automatic changelog generation for PR #13356 [ci skip] 2020-09-15 19:30:28 -05:00
silicons 60106253e3 Merge pull request #13356 from EmeraldSundisk/omegasci
Adds the RD's office to OmegaStation.
2020-09-15 17:30:24 -07:00
CitadelStationBot d0a12da03c Automatic changelog generation for PR #13365 [ci skip] 2020-09-15 19:30:09 -05:00
silicons 97c27b30f5 Merge pull request #13365 from DeltaFire15/tendril-stuff-fixes
Hey wait isn't there numbers between 11 and 15
2020-09-15 17:30:06 -07:00
silicons cffc321050 more 2020-09-15 17:27:50 -07:00
silicons 95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Changelogs 827af29d6f Automatic changelog compile [ci skip] 2020-09-16 00:14:30 +00:00
CitadelStationBot 15b705dd37 Automatic changelog generation for PR #13396 [ci skip] 2020-09-15 17:32:40 -05:00
silicons da1f8c92ab Merge pull request #13396 from timothyteakettle/travis-fix
fixes travis
2020-09-15 15:32:37 -07:00
timothyteakettle 2d1f5ccb43 check your paths 2020-09-15 23:20:57 +01:00
LetterJay faabf247ef Merge pull request #13389 from Citadel-Station-13/donator_halp
Donator Item - Halo
2020-09-15 12:35:38 -05:00
DeltaFire f892309903 fixes 2020-09-15 17:35:58 +02:00
Changelogs d49934db3b Automatic changelog compile [ci skip] 2020-09-15 00:14:43 +00:00
Changelogs e40e0e90c3 Automatic changelog compile [ci skip] 2020-09-14 00:14:58 +00:00
LetterJay 680dee6a82 Update __donator.dm 2020-09-13 16:28:24 -05:00
Jay 511b845b75 donator 2020-09-13 15:32:09 -05:00
DeltaFire bd183e8e28 removes an unneeded check 2020-09-13 13:27:57 +02:00
DeltaFire 8975b93b37 no petting and not petting at the same time 2020-09-13 03:43:31 +02:00
DeltaFire 2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
Changelogs d64a77807d Automatic changelog compile [ci skip] 2020-09-13 00:14:58 +00:00
Timothy Teakettle 744792742b please fix it 2020-09-12 22:32:06 +01:00
MrJWhit 5757ad1420 empty commit 2020-09-12 12:46:56 -04:00
MrJWhit 3df117cd22 Update traumas.json
Haha whoops
2020-09-12 02:35:08 -04:00
MrJWhit 9a89fa498b Update traumas.json 2020-09-12 02:32:17 -04:00
Changelogs f009253b36 Automatic changelog compile [ci skip] 2020-09-12 00:14:16 +00:00
DeltaFire 9e3710bb51 kev request
malf disk gone from the /misc chest type
2020-09-11 23:19:55 +02:00
CitadelStationBot db25ca03b5 Automatic changelog generation for PR #13351 [ci skip] 2020-09-11 16:16:36 -05:00