silicons
98d23bb87b
Merge pull request #14256 from Adelphon/ppantsg
...
Polychromic Pants & Jacket
2021-02-18 17:41:51 -07:00
silicons
e009b9ef5f
Merge pull request #14186 from SmArtKar/trading_card_game
...
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
Adelphon
4c6685333b
Polychromic Pants & Jacket
2021-02-16 05:24:45 -05:00
Adelphon
919e23c122
More Clothes
2021-02-11 02:36:50 -05:00
silicons
4b089f3514
Merge pull request #14202 from DeltaFire15/robo-vendor
...
Adds nanogel to the robodrobe
2021-02-10 02:09:29 -07:00
Adelphon
28d1f93b1c
Clothing PR
...
I added two clothing that I made.
2021-02-09 00:41:11 -05:00
DeltaFire
d482d387ee
whoops
2021-02-07 18:24:18 +01:00
SmArtKar
5c3d134e6e
Actually adds binders as well
2021-02-03 16:46:08 +03:00
SmArtKar
7b2e1ef44f
TCG!
2021-02-02 14:40:29 +03:00
zerothebigboy
c6420ae433
fuck
2021-01-27 22:59:44 -05:00
zerothebigboy
f3072433ff
thankyoubasedrp
2021-01-27 14:56:26 -05:00
Blue Wildrose
88c21942d0
Merge branch 'master' into Timidwomen
2021-01-18 14:42:52 -07:00
Blue Wildrose
c79177ab07
Adds Timid wo/man outfits
2021-01-18 13:42:38 -07:00
Lin
73213b4bad
Merge pull request #14079 from LetterN/patch-3
...
Fixes this vending oversight
2021-01-18 13:17:05 -06: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
Letter N
7afe6d617f
Update kinkmate.dm
2021-01-17 17:50:14 +08:00
necromanceranne
6ac010e442
Merge branch 'master' into robocoat
2021-01-16 04:56:03 +11:00
Hatterhat
cb40ad4764
atomization is cowardice actually
2021-01-12 16:08:17 -06:00
DeltaFire
13beddd42b
nanogel time
2021-01-12 23:02:44 +01:00
necromanceranne
9c0989d233
Merge remote-tracking branch 'upstream/master' into robocoat
2021-01-09 19:02:38 +11:00
MrJWhit
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
necromanceranne
6650d3518a
Mostly ports tgstation #54644 ; New roboticist labcoat sprites
2021-01-04 20:45:11 +11:00
Hatterhat
e63e0ac9bd
something about wardrobes
2020-12-31 22:03:09 -06:00
silicons
0307884eab
Merge pull request #13627 from Ghommie/Ghommie-cit841
...
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons
f2747a3b1c
Merge pull request #13605 from Trilbyspaceclone/patch-403
...
Adds corporate uniforms to the clothing vender
2020-10-28 07:46:24 -07:00
Ghommie
f49f72338f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
Trilbyspaceclone
76a046b97a
Update clothesmate.dm
2020-10-21 11:39:49 -04:00
Ghommie
c0f3317c01
mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.
2020-10-16 20:27:09 +02:00
silicons
ff46bfda10
Merge pull request #13547 from zeroisthebiggay/crepe
...
security fashion power crêpe but it's a sheath for your anime sword
2020-10-11 17:33:29 -07:00
zerothebigboy
ef073167df
crepe
2020-10-10 21:39:45 -04:00
DeltaFire
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
DeltaFire
79af981467
fixes some fun limb code
2020-10-03 21:51:49 +02:00
Detective Google
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
Detective Google
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
EmeraldSundisk
7f0834608e
Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master
...
Citadel station 13 master
2020-09-27 10:09:12 -07:00
Mark9013100
e4f9849cc3
Adds engineering hazard jumpsuits
2020-09-25 15:40:38 -04:00
EmeraldSundisk
079d4eeb58
Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
...
ffs
2020-09-24 19:18:50 -07:00
EmeraldSundisk
7c5de6996b
cargotech wardrobe
2020-09-19 15:41:59 -07:00
YakumoChen
85f8c22da9
adds mech suits to robodrobe
2020-09-18 21:16:25 +00:00
EmeraldSundisk
281d829fe6
Revert "uh what?"
...
This reverts commit 0efa9eb5e5
2020-09-02 14:07:59 -07:00
EmeraldSundisk
0efa9eb5e5
uh what?
2020-09-02 14:07:09 -07:00
Tupinambis
39eac62dcd
moves growth pills and genital autosurgeons to the kinkmate
2020-08-29 23:35:35 -05:00
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
