Unknown
4330bc4b13
security pet bed
2020-09-05 00:37:45 -05:00
Unknown
79a1167f2d
security pet bed
...
fucking merge conflicts make me want to detonate
2020-09-05 00:20:31 -05:00
Unknown
a37b290e13
riding crop
2020-09-05 00:08:25 -05:00
Unknown
46b6e9e832
holy fuck this is a lot
...
adds: slutcurity belt, slutcurity hailer, security latex gloves, pink security jumpsuit
fixes: stripper armor is now in the sec wardrobe, muzzles now properly stop self-removal
2020-09-04 23:30:11 -05:00
Unknown
5baa2cf2c5
can't make sec members sec slaves anymore
2020-09-03 00:57:39 -05:00
Unknown
91301ca1cd
generic messages for admin shenanigan use
2020-09-02 16:39:54 -05:00
Unknown
df0639cc74
whoops typos!
2020-09-01 21:50:37 -05:00
Unknown
05f6b970fd
slave objective respects lewdchem prefs
2020-09-01 21:17:27 -05:00
Unknown
1a500393fe
dont want to enslave nonsentient stuff
2020-09-01 19:53:55 -05:00
Unknown
5331c4a61d
adds slave implant w/ basic functionality
2020-09-01 19:42:14 -05:00
Dahlular
d4a7ace4cf
Merge pull request #418 from ArchieBeepBoop/cake_patch
...
Grindable Urinal Cakes
2020-08-31 02:45:31 -06:00
Dahlular
17c71e4761
Merge pull request #405 from Crashtest-LXXXIX/master
...
Update cigs_lighters.dm
2020-08-31 02:38:29 -06:00
Dip
225d062c31
why
2020-08-30 15:57:54 -03:00
Oposshim
4ad543ef57
soyfood
...
i >asked< for this
2020-08-26 16:51:19 -04:00
Dahlular
b90fe27b72
Merge pull request #395 from ArchieBeepBoop/hl_patch
...
Unforeseen consequences for naming the station Black Mesa
2020-08-25 22:59:19 -06:00
Crashtest-LXXXIX
44574a0663
Update cigs_lighters.dm
...
added some new lines and changed carp cigarettes to 7.5 salt 7.5 nicotine to prevent possible potassium explosion reaction
2020-08-22 02:20:18 +01:00
Crashtest-LXXXIX
a656d33246
Update cigs_lighters.dm
...
added extra chemicals to free cigarettes except for rollies and space cigarettes
2020-08-21 22:58:59 +01:00
Dip
1a41aa79f9
no anomalol weights
2020-08-21 18:21:29 -03:00
Dip
e5260a48f9
Unforeseen consequences for naming the station Black Mesa
2020-08-16 20:33:15 -03:00
Unknown
3720725aff
storge -> storage
2020-08-15 22:30:39 -05:00
Kabra_men
07533114c1
stuff
2020-08-07 03:32:42 -03:00
Dahlular
02fbed82a4
Merge pull request #375 from CydiaButt13/CydiaButt13
...
Removes slurs from the code/Changes the meatball name
2020-08-04 16:05:56 -06:00
Cydia
d8b3888b02
Removes slurs from the code/Changes the meatball name
...
I feel like this was long overdue, especially for github TOS.
2020-08-04 00:13:46 -05:00
QuoteFox
3212dff5e7
Merge pull request #340 from Strazyplus/DRAGONMECH
...
DRAKEBORGS & PLUSHIES
2020-08-03 22:56:28 +01:00
jjpark-kb
08cba9e799
adds a busy check
2020-07-31 20:31:06 -04:00
jjpark-kb
9c47b32571
adds hiding objects
2020-07-30 17:51:55 -04:00
jjpark-kb
73fbdecca1
adds trash piles to maint
2020-07-30 17:16:21 -04:00
Oposshim
23fca2d314
poss tweak
...
a new character creation background (Hirophant tiles)/ I forgot the sec cap Ns/ the NT MREs in maints/ I decided that the medical + is fuck ugly/ sneaked a system shock 2 reference in the toys with the rest of the SS13 sci fi stuff/ more NT i forgot with cargo bounties/ basically more surface level fixes
2020-07-28 19:24:45 -04:00
Navier
760c7c3b53
Merge branch 'master' into DRAGONMECH
2020-07-19 02:42:02 -04:00
Strazyplus
10d8b87431
the basics work, good enough.... lets get this out already fucckkkkk
...
WEEKS OF PAIN
BE GENTLE
GORDON HELP!
2020-07-18 17:44:19 -04:00
Dahlular
cf6fbfbd18
Merge pull request #332 from jjpark-kb/youneedradialsson
...
porting some radials
2020-07-17 18:22:34 -06:00
jjpark-kb
d1e22462ad
lots of radial stuff
2020-07-17 17:58:30 -04:00
jjpark-kb
6ce26a163f
okay, here are some changes
2020-07-16 22:27:26 -04:00
Dahlular
dfaf49573a
Merge pull request #317 from Chemlight/Make-Virology-Great-Again
...
Reverse Engineering Virology from Beeviro
2020-07-14 17:04:38 -06:00
Chemlight
ee62657a24
Reverse Engineering Virology from Beeviro
...
Attempted to fix virology as the current addition/changes were incomplete with the individual working on it just disappearing and just leaving it in it's current state, this change will revert back virology to the old system with the old symptoms and stats as it was before. (hopefully)
2020-07-13 15:57:22 -07:00
Dahlular
18ba11ca9d
Merge pull request #310 from Oposshim/goldenplaque
...
kin.corp addons
2020-07-13 00:23:43 -06:00
Dahlular
58a667e35f
lorebook 1
2020-07-11 21:24:33 -06:00
Oposshim
2e0ce45a75
kin.corp addons
...
dahl wanted the drop pod tweaked. I also threw in a bonus to cheer him up a lil'
2020-07-10 19:40:21 -04:00
CygnusB
dac9ba1246
ports malric plushie
...
hell yes
2020-07-10 02:46:05 -03:00
Oposshim
82d190b276
another poss to kin lore pull
...
nuff said
2020-07-09 03:01:26 -04:00
Oposshim
6fa390975d
Merge remote-tracking branch 'upstream/master' into call-it-whatever-the-fuck-i-want
2020-07-09 02:54:49 -04:00
Oposshim
0716161cd3
another poss 2 kinaris lore push
...
golden plaque + Kin.Co UI revamp
2020-07-09 02:42:40 -04:00
Oposshim
5c588998bc
yet another poss to kinaris push
...
a golden sign in Valarie's name
2020-07-09 02:15:07 -04:00
Dahlular
d3a4402fb2
Merge branch 'master' into pubby
2020-07-08 07:01:36 -06:00
Dahlular
29774be859
Updates PubbyStation for Map Usage (And adds a neat Kinaris sign!)
2020-07-08 06:12:51 -06:00
QuoteFox
212456d64e
Revert "Grab and Drag Animations"
...
This reverts commit ad898efb9e
2020-07-04 08:41:11 +01:00
CygnusB
137ed7f372
Rings
...
hell yeah rings
2020-07-03 19:59:19 -03:00
QuoteFox
ad898efb9e
Grab and Drag Animations
...
Grab and Drag Animations, allowing players to see whos dragging who, via a pixel shift.
2020-07-02 09:58:24 +01:00
QuoteFox
d80c21e25a
Fix to Transit Tubes
...
No longer have collisions.
2020-06-25 04:56:15 +01:00
QuoteFox
4c1e05259d
Merge pull request #277 from Oposshim/call-it-whatever-the-fuck-i-want
...
Call it whatever the fuck i want
2020-06-13 04:10:03 +01:00
