Commit Graph

26895 Commits

Author SHA1 Message Date
Letter N 6547028272 what the fuck?? 2021-01-20 11:56:44 +08:00
Letter N 9fa6958a99 OH FUCK 2021-01-20 11:49:53 +08:00
Letter N 02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +08:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons 2b16435033 Merge pull request #13610 from Putnam3145/fix-eq-hogging
Makes the atmos subsystem pause correctly
2021-01-19 19:29:19 -07:00
Letter N c08765d0eb let's not get ddosed 2021-01-20 10:23:30 +08:00
Artur 745c825205 Give hotkey, but citadel 2021-01-20 04:21:57 +02:00
Arturlang cc4c3533b7 Apply suggestions from code review
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-20 02:25:22 +02:00
Hatterhat a8cb8b79c6 for one, dont forget the sprites, dumbass 2021-01-19 17:40:34 -06:00
Hatterhat e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
Hatterhat 90b85480e1 uuuuuuuuuuuuugh 2021-01-19 17:07:10 -06:00
Hatterhat 1445f448e9 uuuuuuuuuuuuuuuuuuugh 2021-01-19 17:04:59 -06:00
Hatterhat fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
silicons 83566cdbe3 Update parrot.dm 2021-01-19 05:23:43 -07:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
Lin 16e2470e6b Merge pull request #14082 from kappa-sama/patch-45
s
2021-01-18 22:19:15 -06:00
Lin 1fa2b7b331 Merge pull request #14084 from Citadel-Station-13/silicons-patch-23
robots don't get tired from swimming
2021-01-18 20:39:57 -06:00
kittycat2002 b46caa77af Gives /datum/reagent/consumable/ethanol/species_drink a name
This fixes an issue that occurs when attempting to find Ethanol by name using get_chem_id.
2021-01-18 21:39:34 -05:00
timothyteakettle 837e766306 fixes sanitization 2021-01-19 01:04:01 +00:00
Timothy Teakettle b956df2226 name description implement 2021-01-18 21:59:00 +00:00
Blue Wildrose 88c21942d0 Merge branch 'master' into Timidwomen 2021-01-18 14:42:52 -07:00
Blue Wildrose 381f27c5b1 will this work? 2021-01-18 14:28:16 -07:00
Blue Wildrose 5173a7f790 *SCREAM 2021-01-18 14:25:44 -07:00
Blue Wildrose c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
Lin 58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
gorilla pais
2021-01-18 13:22:51 -06:00
Lin 5eafdd164f Merge pull request #14069 from Citadel-Station-13/silicons-patch-18
moves say_emphasis from compose_message to lang_treat to prevent _underlines_ from colliding with command_headset spans having _ in it
2021-01-18 13:21:13 -06:00
Lin 73213b4bad Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
2021-01-18 13:17:05 -06:00
Lin 61d4f2cdad Merge pull request #14080 from Citadel-Station-13/silicons-patch-21
hooded suits now sync colors to their hood on extend
2021-01-18 13:13:00 -06:00
Putnam3145 51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13
"Make it so you can squeeze someone's hand when you hold it"
2021-01-18 10:17:56 -08:00
silicons 0229078b58 Update foam_dart.dm 2021-01-18 02:32:21 -07:00
silicons 4099e57f4e Merge pull request #13963 from necromanceranne/robocoat
Mostly ports tgstation #54644; New roboticist labcoat sprites
2021-01-17 20:43:24 -07:00
silicons 2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
silicons 0db94c5aa8 Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-17 20:41:48 -07:00
silicons 8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment
Replaces majority judgment with usual judgement
2021-01-17 20:41:29 -07:00
silicons af524f4a07 Merge pull request #14029 from HeroWithYay/Sci_Guns_Fix
Ports TG code for wormhole projector and gravity gun.
2021-01-17 20:41:20 -07:00
silicons e336d26a33 Merge pull request #14043 from timothyteakettle/pie-lick
licking people washes pie off their face
2021-01-17 20:40:47 -07:00
silicons c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy
Makes Buzz Fuzz go on a diet
2021-01-17 20:40:22 -07:00
silicons 829e946755 Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
2021-01-17 20:40:09 -07:00
silicons db1693b906 Update colormate.dm 2021-01-17 20:39:00 -07:00
silicons ffa56152d4 Update colormate.dm 2021-01-17 20:36:19 -07:00
silicons 1aae6a2154 Update colormate.dm 2021-01-17 20:35:08 -07:00
silicons 9e52451df8 Update colormate.dm 2021-01-17 20:26:52 -07:00
silicons 6146a4ca9a Update mob_holder.dm 2021-01-17 20:24:53 -07:00
silicons 444ba0ed0d Update pool_main.dm 2021-01-17 20:01:07 -07:00
shellspeed1 c89341227c Adds more dead xeno subtypes for mapping 2021-01-17 18:01:24 -08:00
kappa-sama aa6687646d s
s
2021-01-17 19:50:44 -05:00
silicons 085540af3c Update negative.dm 2021-01-17 15:21:31 -07:00
silicons 3d8bae8cef Update _quirk.dm 2021-01-17 15:20:37 -07:00
silicons 30b1cd82f9 . 2021-01-17 12:02:12 -07:00