Commit Graph

26867 Commits

Author SHA1 Message Date
silicons 4e096d2a9f Update clowncar.dm 2021-01-07 17:11:03 -07:00
silicons acd6a5d8e5 Update sealed.dm 2021-01-07 17:10:26 -07:00
Artur f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
DeltaFire d100fe1d58 Merge pull request #13981 from MrJWhit/caution-sign
Porting the ability to wear the caution sign (plus a random metastation fix)
2021-01-07 20:17:03 +01:00
Timothy Teakettle 44667ae1b6 edits 2021-01-07 16:46:42 +00:00
DeltaFire 3d09edfc4b Merge pull request #13978 from Citadel-Station-13/silicons-patch-3
removes c4 mob gibbing
2021-01-07 06:22:06 +01:00
shellspeed1 926b4ca609 Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret 2021-01-06 18:48:47 -08:00
shellspeed1 21e81faff5 Update traitordevices.dm 2021-01-06 18:48:02 -08:00
shellspeed1 b5e8d3308c Update traitordevices.dm 2021-01-06 18:40:49 -08:00
silicons 90826aeb28 Update robot_parts.dm 2021-01-06 19:39:28 -07:00
shellspeed1 67364f4254 Update traitordevices.dm 2021-01-06 18:26:07 -08:00
DeltaFire e37790a997 fix 2021-01-07 00:23:18 +01:00
shellspeed1 0144a06964 Removes language to be done later 2021-01-06 11:59:37 -08:00
MrJWhit ba98a0aacd Update miscellaneous.dm 2021-01-06 14:42:00 -05:00
DeltaFire 3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
2021-01-06 19:29:17 +01:00
DeltaFire 8b876aa6e3 Merge pull request #13957 from Citadel-Station-13/silicons-patch-1
[s] logging patch 36735734
2021-01-06 19:23:09 +01:00
shellspeed1 98f8af853c Minor xenohybrid changeschanges
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
2021-01-06 01:58:58 -08:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
MrJWhit 1cf951c4d4 Update atmos_control.dm 2021-01-06 02:38:37 -05:00
silicons 16a9361345 move this 2021-01-05 22:48:28 -08:00
silicons 6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds
Ding for prayers
2021-01-05 23:39:37 -07:00
silicons ab59a0d035 Update plastic.dm 2021-01-05 23:38:33 -07:00
silicons 2ad58a7a9d Update mobs.dm 2021-01-05 17:47:05 -07:00
timothyteakettle a375448a54 fixes 2021-01-05 23:18:52 +00:00
Timothy Teakettle 535dede85b i teleported bread 2021-01-05 22:20:41 +00:00
zeroisthebiggay 55d40f6b2d oh yeah fuck descriptions 2021-01-05 16:32:38 -05:00
Lin f724554059 Merge pull request #13964 from Citadel-Station-13/silicons-patch-2
fixes parrying working while otherwise paralyzed
2021-01-05 16:48:20 +00:00
silicons cfc560ed3d Merge pull request #13856 from Putnam3145/harness-tweak-2
Actually made gear harness properly adjustable
2021-01-05 02:52:41 -07:00
Xantholne 18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
silicons b3af424687 Update penis.dm 2021-01-05 02:46:30 -07:00
silicons 21bbbe6f2f Update breasts.dm 2021-01-05 02:46:00 -07:00
silicons 6269819c46 Update status_effects.dm 2021-01-05 02:45:36 -07:00
Artur ffe20839fe tweaks loss numbers 2021-01-04 23:46:48 +02:00
Artur 6388c3cf55 Blood bag delays 2021-01-04 23:43:33 +02:00
Artur 9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
keronshb af3c8edf01 Small blob tweaks + fix
Fixes the permanent consumption of a factory blob w/ blobbernaut failure.  Also changes resource blob pointgen from 1 to 2 and allows factory blobs to be placed across 5 tiles instead of 7.
2021-01-04 12:32:41 -05:00
Xantholne fe4f184792 good night disky 2021-01-04 03:50:43 -07:00
silicons c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
necromanceranne 6650d3518a Mostly ports tgstation #54644; New roboticist labcoat sprites 2021-01-04 20:45:11 +11:00
silicons d6d753e9f7 Merge pull request #13959 from necromanceranne/bokken_fixes
Bokken Fixes: You can make them now. Nyoops.
2021-01-03 21:37:33 -07:00
necromanceranne 0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
silicons a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks
Cog and firelocks.
2021-01-03 20:19:46 -07:00
zeroisthebiggay b20607cb1a Update toolbox.dm 2021-01-03 20:18:55 -05:00
silicons 4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
2021-01-03 18:18:29 -07:00
silicons 3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout
Nightmare Lights Damage Buff
2021-01-03 18:15:00 -07:00
silicons 7357ae3bc0 Merge pull request #13951 from BlueWildrose/CompensatingForSomething
Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20
2021-01-03 18:13:50 -07:00
silicons 8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix
Chemmaster output buff
2021-01-03 18:12:57 -07:00
silicons da358fa60a Update mobs.dm 2021-01-03 18:12:33 -07:00
silicons 092e7569c2 Merge pull request #13932 from shellspeed1/Ports-xeno-QOL-stuff
Ports xenomorph plasma usage in power description from bee
2021-01-03 18:11:18 -07:00
silicons ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon
Ports bluespace navigation gigabeacon from TG
2021-01-03 18:11:10 -07:00