silicons
|
fa587e3d1a
|
Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
|
2021-01-20 15:20:45 -07:00 |
|
silicons
|
288bbcd334
|
Merge pull request #14107 from shellspeed1/Brings-back-mining-point-card-for-borgs
Mining borgs get a point ID again.
|
2021-01-20 15:17:47 -07:00 |
|
silicons
|
9f50ea66c8
|
Merge pull request #14104 from LetterN/semi-sync
[s] semi sync- we forgot the anti ddos thing
|
2021-01-20 15:14:37 -07:00 |
|
Lin
|
d262f366e7
|
Merge pull request #14097 from Citadel-Station-13/silicons-patch-28
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
|
2021-01-20 15:20:50 -06:00 |
|
Putnam3145
|
2debe930fc
|
Merge pull request #14094 from kittycat2002/master
Gives /datum/reagent/consumable/ethanol/species_drink a name
|
2021-01-20 08:45:52 -08:00 |
|
shellspeed1
|
81e37b6e33
|
Update robot_modules.dm
|
2021-01-19 21:40:47 -08:00 |
|
silicons
|
ae5cb78424
|
Update toggles.dm
|
2021-01-19 22:27:13 -07:00 |
|
Letter N
|
a68957dcc4
|
wow thanks tabnine 😂
|
2021-01-20 12:02:20 +08:00 |
|
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
|
021b28a2b7
|
cleanup
shitcode - b - gone
|
2021-01-20 11:08:21 +08: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 |
|
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 |
|
Lin
|
58dde0f60e
|
Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
gorilla pais
|
2021-01-18 13:22:51 -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
|
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
|
444ba0ed0d
|
Update pool_main.dm
|
2021-01-17 20:01:07 -07:00 |
|
kappa-sama
|
aa6687646d
|
s
s
|
2021-01-17 19:50:44 -05: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
|
7afe6d617f
|
Update kinkmate.dm
|
2021-01-17 17:50:14 +08: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 |
|
necromanceranne
|
6ac010e442
|
Merge branch 'master' into robocoat
|
2021-01-16 04:56:03 +11: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
|
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 |
|
Hatterhat
|
a468f400e3
|
see branch name
|
2021-01-14 20:55:06 -06:00 |
|
Hatterhat
|
798b25846d
|
gauze parity
|
2021-01-14 20:53:55 -06:00 |
|
silicons
|
a9b3e6a514
|
Update carbon_defense.dm
|
2021-01-14 04:33:15 -07:00 |
|
The0bserver
|
1b469bdfda
|
The power of overwriting...
|
2021-01-14 01:03:48 -05:00 |
|
silicons
|
05fcd10506
|
Update carbon_defense.dm
|
2021-01-13 22:46:01 -07:00 |
|
silicons
|
1188431bcb
|
Update carbon_defense.dm
|
2021-01-13 22:40:13 -07:00 |
|
silicons
|
8f7b483161
|
remove reverb
|
2021-01-13 21:37:30 -07:00 |
|