Commit Graph

117 Commits

Author SHA1 Message Date
Dip
af25a764c1 Actually let's change this 2020-11-17 06:00:26 -03:00
Dip
33d0839c44 Typo + Early return 2020-11-17 05:10:15 -03:00
Dahlular
28096ff19b Merge pull request #680 from ArchieBeepBoop/lunar
Lunar Items v0.1
2020-11-13 19:15:12 -07:00
Dip
c7d37da6d6 color change? color change. 2020-11-13 19:38:41 -03:00
Dip
1b2b42f8a6 a 2020-11-13 19:16:31 -03:00
Dip
579211f214 Lunar Items v0.1 2020-11-13 19:08:07 -03:00
Dip
99d5f2f43b Fuck monochrome, polychrome is now the deal 2020-11-10 20:50:28 -03:00
QuoteFox
10061594d8 comment out on comd.dm
comment out on comd.dm (confusing how to use condoms with extra features.)
2020-11-09 21:03:39 +00:00
JaySparrow
d64ead68ac Merge branch 'master' into Dynamic2 2020-11-03 00:39:13 -06:00
JaySparrow
8d1ef78a58 buncha stuff
Hoo boy, lost power for a week, this should have been done so long ago
2020-11-03 00:35:55 -06:00
Dahlular
5f257c785b Merge pull request #629 from BoxyBoy/sizeCodeFixStuff
Size code examine text
2020-10-29 22:48:08 -06:00
BoxyBoy
75f967bd88 Character Size Examine Text
Adds a line of examine text when examining a character and gives an aproximation of their height.
2020-10-29 21:55:42 -06:00
Dahlular
bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo
Ports: GetComponent macros removal, and few other updates.
2020-10-29 10:30:33 -06:00
Dip
e7f549b57e A proper alert for ghost role character appearance loading 2020-10-27 15:50:24 -03:00
kevinz000
2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip
fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -03:00
JaySparrow
e536168d4f Changeling Fix
Size and clothesplosion
2020-10-12 18:04:56 -05:00
Dahlular
0756155230 Merge pull request #564 from Kabramen/sounding
Sounding Rod
2020-10-10 23:16:24 -06:00
Kabra_men
ab2c32decd Sounding Rod 2020-10-07 19:11:18 -03:00
Dip
52eaf9ed92 BOY 2020-10-05 11:07:52 -03:00
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