Commit Graph

508 Commits

Author SHA1 Message Date
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
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
Unknown 7e7848fa8b adds slave implant to techweb 2020-09-01 20:29:50 -05:00
Dahlular 5aaf11b3d9 Merge pull request #421 from TotallyNotADog/ballgag
Adds Ball Gag
2020-08-31 02:47:51 -06:00
Dahlular 0c7b49d745 Merge pull request #387 from Jay-Sparrow/antags
Lewd Antag
2020-08-31 02:41:58 -06:00
Unknown cadab7c519 mmmmph! 2020-08-30 18:12:56 -05: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
Poss 9dd397dbd2 Update snack.dm 2020-08-26 18:12:39 -04:00
Poss 06067efe9d Update snack.dm 2020-08-26 18:12:06 -04:00
Oposshim 4ad543ef57 soyfood
i >asked< for this
2020-08-26 16:51:19 -04:00
Dahlular 05a636f647 Makes Events Less Chaotic 2020-08-25 22:42:48 -06:00
Dip e66785af28 Round Time fix (Finally!) And more status tab optimizations 2020-08-25 22:06:38 -03:00
QuoteFox 9821bb326d Merge pull request #407 from ArchieBeepBoop/status_tab_patch
Status Tab Investigation Part 2 - Electric frameratearoo
2020-08-25 04:41:39 +01:00
Dip 051364b295 time dilation removal + interval increase 2020-08-24 23:58:20 -03:00
QuoteFox b77a5533d8 Merge pull request #404 from ArchieBeepBoop/status_tab_patch
Status tab patch
2020-08-24 04:46:09 +01:00
Dahlular fbb05ca26a Lowered Pirate Spawn Chance 2020-08-21 22:33:51 -06:00
Vladin Ampora a6973b403f Update drink_reagents.dm
excuse me are you fucking dense why did you make this a tea this is literally the only place it is classified as a tea so of course it doesn't work
2020-08-21 21:50:21 -04:00
Dip d825304e00 removing commented code 2020-08-21 18:03:26 -03:00
Dip 557e6a4748 Status Tab Experimental Fix 2020-08-21 18:01:21 -03:00
Dahlular 01914c471b Merge pull request #393 from Kabramen/more-clowns
clown mobs ported from /TG/ *honk*
2020-08-20 19:31:18 -06:00
Unknown 3720725aff storge -> storage 2020-08-15 22:30:39 -05:00
Kabra_men 38397ec681 adds clown lube + superior honk render 2020-08-15 23:14:11 -03:00
Kabra_men f22746d669 HONK 2020-08-15 21:30:35 -03:00
Dahlular 937a315751 Jobtime Fixes 2020-08-15 11:01:16 -06:00
QuoteFox d416922b24 Rustg update and global ban search for admins
global ban search for admins
2020-08-14 00:44:18 +01: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
Dahlular 1eb15fa5e4 Re-Enables Jobtime Restrictions(cap), Adjusts Values 2020-08-11 18:05:28 -06:00
Dahlular 6ecda9d8d6 whoops 2020-08-11 18:00:12 -06:00
Dahlular c7a4b150f0 QM is a head fuck you 2020-08-11 17:58:09 -06:00
Dahlular 535e63fea6 Re-Enables Jobtime Restrictions(sci), Adjusts Values 2020-08-11 17:43:24 -06:00
Dahlular c7d9598172 Re-Enables Jobtime Restrictions(eng), Adjusts Values 2020-08-11 17:41:37 -06:00
Dahlular 6985e6b766 Re-Enables Jobtime Restrictions(med), Adjusts Values 2020-08-11 17:38:50 -06:00
Dahlular 70c094bfc4 Re-Enables Jobtime Restrictions(sec), Adjusts Values 2020-08-11 17:35:45 -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