Commit Graph

26867 Commits

Author SHA1 Message Date
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
silicons a917034542 Update toggles.dm 2021-01-17 03:46:20 -07:00
silicons 45a2076771 Update toggles.dm 2021-01-17 03:35:49 -07:00
Letter N 0b088be4df missing , 2021-01-17 18:00:43 +08:00
Letter N 919b8c8d57 Update machine_circuitboards.dm 2021-01-17 17:54:06 +08:00
Letter N 7afe6d617f Update kinkmate.dm 2021-01-17 17:50:14 +08:00
Hatterhat 6e18f10ead forgot i wasnt usin that oops 2021-01-17 01:50:28 -06:00
Hatterhat cb1ef2d8ba cotton stack pull 2021-01-17 01:42:32 -06:00
silicons b6cdde2f52 squeak fix 2021-01-16 06:12:34 -07:00
silicons e96fec682e fix 2021-01-16 04:59:07 -07:00
silicons 5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
YakumoChen 693887487b I saw what had been wrought, and trembled 2021-01-16 08:29:14 +00:00
YakumoChen fba17abaf4 god damn it Trilby 2021-01-16 08:23:08 +00:00
silicons 98bc547c5b Update say.dm 2021-01-16 01:07:52 -07:00
necromanceranne 6ac010e442 Merge branch 'master' into robocoat 2021-01-16 04:56:03 +11:00
DeltaFire 3e917653c7 Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
2021-01-15 18:50:14 +01:00
DeltaFire d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
2021-01-15 18:30:32 +01:00
DeltaFire de40e96180 Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
2021-01-15 18:30:16 +01:00
DeltaFire aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
2021-01-15 18:22:05 +01:00
DeltaFire f1d254f4e5 Merge pull request #14057 from Citadel-Station-13/silicons-patch-15
removes stealthmin orbit block
2021-01-15 18:15:56 +01:00
DeltaFire 771a4f3c41 Merge pull request #14060 from Hatterhat/shrink-removal
removes shrink ray again because "wait, whose idea was to readd this?" (turns out it was shoehorned back in by lettern during the tgui port)
2021-01-15 18:14:42 +01:00
silicons 68e9be9647 Merge pull request #14042 from kiwedespars/dildo-1
adds klonk sound effect for literal horsecock dildo
2021-01-15 04:00:08 -07:00
kappa-sama 1134e1ce20 i don't wanna talk about it 2021-01-15 00:36:45 -05:00
silicons 8e8d1571f0 sigh 2021-01-14 20:43:27 -07:00