Commit Graph
1331 Commits
Author SHA1 Message Date
DahlularandGitHub 6d49f6e9b3 Merge pull request #424 from TotallyNotADog/slaveImplant
The Slutcurity Update. Powered by Horny™
2020-09-05 19:15:08 -06:00
Unknown c9ee9cde26 Revert "Adds a sec bed with special name + desc to HoS office"
I'm not gonna bother with fixing a trillion merge conflicts for something this small.
2020-09-05 18:45:56 -05:00
Unknown 339e0d9e0f slutcurity hailer sub mode 2020-09-05 18:37:14 -05: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
DahlularandGitHub bcc1848449 Merge pull request #431 from ToonClyde/Bridge-pipe-fix
fix the bridges pipes yes
2020-09-05 05:30:12 -06:00
ToonClyde 5f7d9c3b6e fix the bridges pipes yes 2020-09-05 04:24:55 -07:00
DahlularandGitHub 8e2f6468ec Merge pull request #428 from ToonClyde/box-dorm-rework
Box dorm rework
2020-09-05 04:35:18 -06:00
ToonClyde 9053906f40 Dahl wanted a punching bag 2020-09-05 03:33:26 -07:00
DahlularandGitHub 05c92fd895 Merge pull request #430 from Fabian272/master
Milking Machine Speed V2: Electric Boogaloo
2020-09-05 04:07:17 -06:00
DahlularandGitHub 9fbb526b59 Merge pull request #429 from Shadow-Quill/XenoDigiLegs
Xeno Digitigrade Leg Fix
2020-09-05 03:10:35 -06:00
Fabian272 5779dd5d18 Update milking machine.dm 2020-09-05 11:09:24 +02:00
Unknown 9c746b9e52 Adds a sec bed with special name + desc to HoS office
Put it on Box and Pubby, and Meta for futureproofing.
2020-09-05 03:21:52 -05:00
Unknown 84aafa49c5 adds tall jackboots, pink jumpsuit+skirt to loadout 2020-09-05 03:00:13 -05:00
Shadow Quill e6d3c18cfd Fix 2020-09-05 02:44:14 -05:00
Unknown b8d76bc301 fixes an error in the tall jackboots icon
thanks for reminding me of this dahl
2020-09-05 02:25:06 -05:00
Unknown c3909dcf2d restores attack_paw()
because apparently it's for monkies. fuck.
2020-09-05 01:22:18 -05:00
Unknown a62ea2b752 nerfs bitch breaker's suicide_act 2020-09-05 00:38:59 -05:00
Unknown 4330bc4b13 security pet bed 2020-09-05 00:37:45 -05:00
Shadow Quill 6f04048e1b Xeno Digitigrade Leg Fix 2020-09-05 00:37:42 -05:00
Unknown 62cf36ddea fixes more merge conflict fuckery 2020-09-05 00:23:39 -05:00
Unknown 79a1167f2d security pet bed
fucking merge conflicts make me want to detonate
2020-09-05 00:20:31 -05:00
Unknown 55230cb73d Merge remote-tracking branch 'origin/slaveImplant' into slaveImplant 2020-09-05 00:12:08 -05:00
Unknown a37b290e13 riding crop 2020-09-05 00:08:25 -05:00
Unknown 95891e97b0 fixes the corset not working
i dont care if it's unrelated it has the same fix as my jumpskirt issue so i might as well
2020-09-05 00:02:05 -05:00
Unknown cc7013f802 the bitch breaker 2020-09-05 00:01:06 -05:00
Unknown 66d3400e9c the bitch breaker 2020-09-04 23:53:15 -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
ToonClyde 069f8a8582 Below on that pipe 2020-09-04 15:15:46 -07:00
Unknown 1527edfa6b how could i forget the collars? 2020-09-04 15:07:49 -05:00
Unknown fe68e382fa fixes jumpskirt and stripper outfit, adds to secdrobe
I knew the fix from the beginning from vg_clothes.dm and it took an entire afternoon of failed fixes to realize FUCK
2020-09-04 14:08:46 -05:00
QuoteFox 6134118402 patreon rewards!
Luweth, Jackattack
2020-09-04 15:08:39 +01:00
Fabian272 eac7de08f7 Update milking machine.dm 2020-09-04 14:32:16 +02:00
Unknown 853cf6952e a lot of fuckin clothes
Slutty sec skirt, sec stripper outfit, 2 armor bikinis, knee-high jackboots, and a beret. I think this is enough for now.
2020-09-03 22:21:34 -05:00
DahlularandGitHub a0b1d083ad Merge pull request #422 from ArchieBeepBoop/master
Final Status Tab Fix
2020-09-03 12:58:15 -06:00
DahlularandGitHub c02e28d020 Merge pull request #423 from Jay-Sparrow/master
Maybe fix for antag
2020-09-03 12:57:25 -06:00
DahlularandGitHub 282a25142c Merge pull request #426 from TotallyNotADog/ropeUpdate
Resprites for the Rope
2020-09-03 12:55:59 -06:00
Unknown 5baa2cf2c5 can't make sec members sec slaves anymore 2020-09-03 00:57:39 -05:00
Unknown bd1cd96aac if rope is so good, why isn't there a rope 2? 2020-09-02 20:05:05 -05:00
ToonClyde 2500ae1d73 gosh darn gravity pressure!! 2020-09-02 15:49:17 -07:00
Unknown 91301ca1cd generic messages for admin shenanigan use 2020-09-02 16:39:54 -05:00
ToonClyde 1660fcf46a Pokemon Dorms & Gyms 2020-09-02 00:13:56 -07: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 7e7848fa8b adds slave implant to techweb 2020-09-01 20:29:50 -05:00
Dip cc0f48df38 Status tab final fix 2020-09-01 22:29:10 -03: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
JaySparrow 78fc7ce945 Maybe fix for antag
Hard to test outside of a live environment, but let's see if this fixes the target picker giving "nothing".

Also changes one label on preferences for a little more clarity. I'll work on it more.
2020-09-01 16:48:30 -05:00
Dip 4d3c98b639 Remove useless bit of code for status tab fix 2020-08-31 21:29:46 -03:00
DahlularandGitHub 5aaf11b3d9 Merge pull request #421 from TotallyNotADog/ballgag
Adds Ball Gag
2020-08-31 02:47:51 -06:00