Commit Graph

97 Commits

Author SHA1 Message Date
Dip
461cd2b042 getting micro to work again 2020-10-02 19:46:12 -03:00
Dip
4d39d175c4 partially enable micro holding 2020-10-02 14:40:10 -03:00
kevinz000
f318dbe1b2 Merge pull request #10881 from Ghommie/Ghommie-cit552 2020-10-02 02:14:44 -03:00
QuoteFox
95d8e0ffe5 Merge pull request #514 from Jay-Sparrow/Dynamic2
Adjust Midround Antag chance
2020-09-26 23:02:02 +01:00
QuoteFox
06910dc9ad Carrion Mob
A mass of tenticles, that admins can spawn. Based on the game Carrion.
2020-09-26 18:21:35 +01:00
JaySparrow
5b079995a1 Increase Dynamic spice
Decreases the costs of numerous events, and decreases the costs of midround antags. Adjusts injection chance. A couple other tweaks. Preps for addition of other antags.
2020-09-26 06:08:42 -05:00
QuoteFox
fc4c7c3bc0 Revert "Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2""
This reverts commit de57597599.
2020-09-25 13:30:25 +01:00
QuoteFox
de57597599 Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2"
This reverts commit 2bb89753e9, reversing
changes made to 99065c9f92.
2020-09-25 13:24:14 +01:00
JaySparrow
bb8e2a91bd Dynamic Mode for reals
Here we go.
2020-09-24 23:54:21 -05:00
JaySparrow
33e5ad2dec Revert "Dynamic Mode"
Gotta remove some config files
2020-09-24 23:52:51 -05:00
JaySparrow
ed9590c1d9 Dynamic Mode
And I thought synths were hard
2020-09-24 23:44:14 -05:00
Dahlular
6aa49fd730 Scaling pickup timer 2020-09-21 09:26:18 -06:00
Dahlular
cec839a100 Fix stepping text, updates health values 2020-09-21 07:21:51 -06:00
Unknown
d770544167 gets rid of ..() 2020-09-20 16:01:52 -05:00
Dahlular
b8c0e96a3e Update Recipes 2020-09-14 05:31:47 -06:00
Dahlular
82cba6adfb Craftable Sizechems 2020-09-14 04:50:02 -06:00
JaySparrow
cec9994bf8 Fix for the antag fix
My brain is a raisin aaaaaaaaaa
2020-09-13 04:36:04 -05:00
Dahlular
0471864e62 Merge pull request #452 from Chemlight/Size-n-bits
Length times Size
2020-09-11 23:49:27 -06:00
Chemlight
f4ce9e94d8 Length times Size
This is more so a change to examine text and flavor text revolving around our size code we have in game, ultimately if one were to be 50% sprite size (Which is roughly three feet tall as we're doing 6ft for basic height reference), and sporting a rod that's just the same size in comparison. It should instead be half the amount based off sprite size, ending up being a foot and six inches versus three feet.
2020-09-11 22:34:14 -07:00
Dahlular
889f0781b3 more micro interactions 2020-09-11 08:17:37 -06:00
Dahlular
6d49f6e9b3 Merge pull request #424 from TotallyNotADog/slaveImplant
The Slutcurity Update. Powered by Horny™
2020-09-05 19:15:08 -06:00
Dahlular
05c92fd895 Merge pull request #430 from Fabian272/master
Milking Machine Speed V2: Electric Boogaloo
2020-09-05 04:07:17 -06:00
Fabian272
5779dd5d18 Update milking machine.dm 2020-09-05 11:09:24 +02: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
Fabian272
eac7de08f7 Update milking machine.dm 2020-09-04 14:32:16 +02:00
Dahlular
c02e28d020 Merge pull request #423 from Jay-Sparrow/master
Maybe fix for antag
2020-09-03 12:57:25 -06:00
Unknown
bd1cd96aac if rope is so good, why isn't there a rope 2? 2020-09-02 20:05:05 -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
Dahlular
0c7b49d745 Merge pull request #387 from Jay-Sparrow/antags
Lewd Antag
2020-08-31 02:41:58 -06:00
Dahlular
aaabc39fb9 Nerf Grab Intent Hardstun 2020-08-21 20:38:27 -06:00
JaySparrow
3d12f6150d Update traitor_lewd.dm
Cut out old comments
2020-08-09 19:32:15 -05:00
JaySparrow
999f2d6662 Lewd Antag
Finally
2020-08-09 19:22:38 -05:00
QuoteFox
31b07829ba cringe
cringe
2020-08-07 12:54:01 +01:00
QuoteFox
d66ed7aef5 spelling error
spelling error
2020-08-06 06:54:04 +01:00
QuoteFox
5a3f1875a4 intergrated circuit additions
intergrated circuit additions
2020-08-06 06:46:56 +01:00
Dahlular
890609c0ab mobs have holder sizes respective to size multiplier 2020-08-03 10:54:02 -06:00
QuoteFox
5bc00f5c2d Adds condoms and genital colour tinting commands.
Adds condoms and genital colour tinting commands.
2020-08-01 07:29:26 +01:00
Dahlular
1a3e674e1e Fixes stepping lines 2020-07-22 09:50:21 -06:00
Dahlular
a3ea5e06ba Growth and Shrink chems 2020-07-22 07:22:18 -06:00
Dahlular
157eb2eff1 Changes some Stomping Values (TM) 2020-07-21 15:08:09 -06:00
Dahlular
a5b1f05d17 Hits macros and micros with a nerf hammer (again) 2020-07-20 22:15:16 -06:00
JaySparrow
14cdc61f43 size code fixes
fuckin soze coode fuck. Like, stepping buffs. Stepping nerfs. Speed stuff. My brain hurts. Here is code yum yum.
2020-07-20 01:03:15 -05:00
JaySparrow
36257c0d9a SIZE CODE
3 AM, WOOO. MAYBE IT WORKS NOW.
2020-07-16 03:05:10 -05:00
JaySparrow
cbd99e5aaf Health and speed relative to size
Pikmin nerf, oh no. Health scales with size. And, being big or small nerfs speed a little.
2020-07-15 23:17:41 -05:00
JaySparrow
7e8ea19b69 Lewd bounties
Milk the crew. Get paid. This is the FUTURE.
2020-07-13 22:13:05 -05:00
JaySparrow
50ab355f81 Leash patch
Prevents someone from being leashed twice. There will be no more pet fueled singularities.
2020-07-11 18:52:18 -05:00
Dahlular
33f69de6a0 Further fixes 2020-07-11 01:09:03 -06:00
Dahlular
43ed6b41f9 fixes stepping under interactions and allows more size pref sizes
unga dunga
2020-07-10 23:50:10 -06:00
JaySparrow
3c572f0d6e Do Not Clone
Adds a new trait for people who don't want to be cloned. Gives the medical bay something to do at least.

Also, moves a define to it's appropriate folder to prevent any potential future problems because for some reason it does matter where those defines are for certain procs. The new trait is in negative.dm instead of the hyper traits file, because it populates the list in that order and not based on cost.
2020-07-07 19:49:04 -05:00