silicons
|
7f942abef2
|
Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
|
2020-08-23 05:08:14 -07:00 |
|
zerothebigboy
|
21836b4ec8
|
: )
|
2020-08-22 18:11:03 -04:00 |
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
silicons
|
3068accd2b
|
Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
|
2020-08-09 05:39:56 -07:00 |
|
Letter N
|
f1c4a7f6ac
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-09 14:54:16 +08:00 |
|
Putnam
|
467f66b2a6
|
Removed crocin/hexacrocin.
|
2020-08-08 00:46:30 -07:00 |
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
Letter N
|
9eb7aaa2d1
|
fixes pumps and reverts this small vending change
|
2020-08-07 16:12:44 +08:00 |
|
lolman360
|
ea97e98b5c
|
Update _vending.dm (#13035)
|
2020-08-06 18:04:03 +02:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
TrilbySpaceClone
|
0f29235e6a
|
Tea Party
|
2020-08-04 09:15:44 -04:00 |
|
Letter N
|
454baea55f
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-04 09:31:34 +08:00 |
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
Timothy Teakettle
|
03d01d917f
|
Merge branch 'master' into wounds-part-2
|
2020-08-02 18:10:31 +01:00 |
|
Auris456852
|
03cff55017
|
Adds roboticist cartridge to the PDA vendor.
|
2020-07-30 23:31:31 +03:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Letter N
|
782e3c2ffb
|
copypaste phase complete, major:vendies
|
2020-07-30 14:17:35 +08:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Adelphon
|
1f508ef15d
|
Adds Camo To AutoDrobe (fix)
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
|
2020-07-28 15:04:58 -04:00 |
|
zerothebigboy
|
6329b2a760
|
a
|
2020-07-26 23:32:36 -04:00 |
|
timothyteakettle
|
8360bb1a7f
|
section 2
|
2020-07-24 23:44:57 +01:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
9222933d77
|
Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
|
2020-07-23 10:25:25 -07:00 |
|
lolman360
|
17d1fd0692
|
fixes
|
2020-07-22 12:42:46 +10:00 |
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
zerothebigboy
|
7b35c5fd9d
|
a
|
2020-07-21 02:30:32 -04:00 |
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
silicons
|
3d2995b4e8
|
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
|
2020-07-20 17:01:32 -07:00 |
|
silicons
|
267186a5d3
|
Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
|
2020-07-20 16:15:38 -07:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
CameronWoof
|
431c52b7e2
|
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
|
2020-07-17 17:22:43 -07:00 |
|
silicons
|
04df84d1e0
|
Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
|
2020-07-17 17:07:46 -07:00 |
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
CameronWoof
|
a493ecdc4a
|
suture and mesh additions
|
2020-07-15 16:44:24 -07:00 |
|
Timothy Teakettle
|
6be10d041c
|
add to clothesmate
|
2020-07-14 21:10:37 +01:00 |
|
Cirno
|
020da9fa07
|
i hope this works
|
2020-07-04 15:47:38 -03:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
Letter N
|
b35e3f2b93
|
fix: R&D Console, Vending, and chem master
|
2020-07-01 19:07:03 +08:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
silicons
|
771714cc78
|
Merge pull request #12629 from kappa-sama/patch-28
https://github.com/tgstation/tgstation/pull/51886 by Fikou
|
2020-06-29 14:50:59 -07:00 |
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
YakumoChen
|
3b802ac062
|
actually stocks the new clothing
|
2020-06-29 13:38:36 +00:00 |
|
kappa-sama
|
548fabfb2d
|
viscera cleanup detail
|
2020-06-27 18:21:22 -04:00 |
|
kappa-sama
|
fec2d1aded
|
someone call the janitor
|
2020-06-27 18:21:01 -04:00 |
|
kappa-sama
|
bf6a1b3de4
|
cleanup crew
|
2020-06-27 18:20:40 -04:00 |
|