Commit Graph

773 Commits

Author SHA1 Message Date
Unknown
91490e10e2 secbed is now deployed from grenade
because pulling a bed out of a vending machine was ridiculous
2020-09-09 13:36:01 -05:00
Unknown
b6a54f2ff9 slutbelt minor update
Now can carry: Everything a secbelt can, minus the ammunition and combat knife, in addition to condoms, whips/riding crops, and sluthailers.
2020-09-09 13:20:36 -05:00
JaySparrow
a0afddfa95 Ninja Nerf
Emp 25 > 40
Ninja Star 1 > 10
Teleport 3 sec > 10 sec
No more capture objectives
Changed an instance of Nanotrasen to Kinaris.
2020-09-09 01:46:05 -05:00
Versallion
30e50b0c6b Synthtissue now takes sugar instead of nutriment
megaepic win for all these doctors

i hope that didnt fuck up something
2020-09-07 22:06:35 -05:00
Versallion
7026c0d93a Hey did you know abductors spawned 20 minutes into the round?
That wouldve been bad
2020-09-07 21:56:35 -05:00
Dahlular
1c6a5d0300 Merge pull request #437 from ToonClyde/big-tails
2 new big tails
2020-09-07 01:19:33 -06:00
Dahlular
c57cbc18a1 Merge pull request #436 from ArchieBeepBoop/jcdenton
Augmented Endround Liners
2020-09-07 01:18:19 -06:00
ToonClyde
7c7cc72a82 2 new big tails 2020-09-06 23:31:02 -07:00
Dip
9e45725ffc Augmented End Round Liners 2020-09-06 16:07:32 -03:00
Vladin Ampora
5cddfc861e Who are you? Where am I?
funny drinks shit hahahahaahaahahdbwdeuwfhfof
2020-09-06 05:23:02 -04:00
Dahlular
6d49f6e9b3 Merge pull request #424 from TotallyNotADog/slaveImplant
The Slutcurity Update. Powered by Horny™
2020-09-05 19:15:08 -06: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
Unknown
c3909dcf2d restores attack_paw()
because apparently it's for monkies. fuck.
2020-09-05 01:22:18 -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
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
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
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
Dahlular
a0b1d083ad Merge pull request #422 from ArchieBeepBoop/master
Final Status Tab Fix
2020-09-03 12:58:15 -06: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
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
Dahlular
5aaf11b3d9 Merge pull request #421 from TotallyNotADog/ballgag
Adds Ball Gag
2020-08-31 02:47:51 -06:00
Dahlular
d4a7ace4cf Merge pull request #418 from ArchieBeepBoop/cake_patch
Grindable Urinal Cakes
2020-08-31 02:45:31 -06:00
Dahlular
0c7b49d745 Merge pull request #387 from Jay-Sparrow/antags
Lewd Antag
2020-08-31 02:41:58 -06:00
Dahlular
17c71e4761 Merge pull request #405 from Crashtest-LXXXIX/master
Update cigs_lighters.dm
2020-08-31 02:38:29 -06:00
Unknown
cadab7c519 mmmmph! 2020-08-30 18:12:56 -05:00
Dip
225d062c31 why 2020-08-30 15:57:54 -03:00
Dip
4ccc48b5e4 Crash debug fix for BSQL and configuration.dm 2020-08-28 14:15:09 -03:00
Dahlular
0a8c927b2a Merge pull request #413 from ArchieBeepBoop/status_tab_patch
Smaller code footprint, fix internal blinking status
2020-08-28 00:45:17 -06:00
Dahlular
66f1d66fe4 Merge pull request #415 from Jay-Sparrow/Bug-fixin
AI time lock
2020-08-28 00:41:50 -06:00
JaySparrow
e9bba2e1e7 AI time lock
SHUT IT DOWN.
2020-08-28 01:35:27 -05:00
Dip
dfa7ec073e Smaller code footprint, fix internal blinking status 2020-08-27 17:34:19 -03:00
QuoteFox
7a5e19055c Merge pull request #409 from ArchieBeepBoop/status_tab_patch
Round Time fix (Finally!) And more status tab optimizations
2020-08-27 07:50:10 +01:00
Dahlular
d0e20eefb3 Merge pull request #411 from Oposshim/deus-ex
soyfood vend/ packets
2020-08-27 00:46:13 -06:00