Commit Graph

260 Commits

Author SHA1 Message Date
Dahlular 6d49f6e9b3 Merge pull request #424 from TotallyNotADog/slaveImplant
The Slutcurity Update. Powered by Horny™
2020-09-05 19:15:08 -06:00
Unknown 4e272b9cf4 blue yeen's request
pink sec winter coat, BDSM whip + riding crop now inflict arousal damage on all intents + have special interaction if you target the groin (ass), slutbelt now can carry flashbangs/grenades + classic batons
2020-09-05 17:13:33 -05:00
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
QuoteFox 6134118402 patreon rewards!
Luweth, Jackattack
2020-09-04 15:08:39 +01: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
QuoteFox eaf38d2910 Fps and glide speed
Fps and glide speed
and walk speed making your glide slower
2020-08-14 00:05:04 +01:00
Dahlular 154d8f5539 Removes robot_army objective 2020-08-12 22:39:28 -06:00
QuoteFox ac03f4865b Merge pull request #383 from Kabramen/more-stuff-+-clown-masks
New items+ loadout changes + new clown mask types
2020-08-10 10:04:07 +01:00
JaySparrow 99326d6303 Alternate Job Titles fix
Speak up announcer bot, please.
2020-08-07 20:28:48 -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
Dahlular 8f0eabe199 Merge pull request #356 from jjpark-kb/trashpiles
Trashpiles
2020-08-01 04:29:45 -06: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
Dahlular 7d2c3e8581 Merge pull request #354 from quotefox/lagimprovements
Lag cleaning.
2020-07-30 11:55:55 -06:00
Dahlular 5b933cb277 Merge pull request #352 from Oposshim/Poss-Fix-v1
poss tweak
2020-07-30 08:23:23 -06:00
Dahlular 1e833ff6ff Merge pull request #351 from jjpark-kb/posialertsystem
adds the positronic alert system
2020-07-30 08:15:51 -06:00
QuoteFox b1d82e4ff5 Lag cleaning.
Ports and Improvements to help attack lag.
2020-07-29 23:54:40 +01:00
jjpark-kb 29f32eedd6 changes the cyan to purple for research doors 2020-07-28 19:37:40 -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
jjpark-kb 08ba88559f adds the positronic alert system 2020-07-28 18:42:23 -04:00
Chemlight e7adf4df86 Brushed off salt
Changed 20 seconds to 15.
2020-07-27 18:53:46 -07:00
Chemlight f1d59db927 Sonic Jack Hammer Nerf
This change is to modify the sonic jackhammer intereacting with reinforced walls from a previous 5 seconds to a now total of 20 seconds
2020-07-27 13:36:48 -07: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 5a6a1ecd46 Merge pull request #333 from Jay-Sparrow/cloning
Cloning fix
2020-07-17 19:39:51 -06:00
Jay-Sparrow b6c4bc088b Merge branch 'master' into cloning 2020-07-17 19:42:19 -05:00
jjpark-kb bc43bb59cd Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:40:53 -04:00
Dahlular cf6fbfbd18 Merge pull request #332 from jjpark-kb/youneedradialsson
porting some radials
2020-07-17 18:22:34 -06:00