Commit Graph

79 Commits

Author SHA1 Message Date
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
QuoteFox
cfd822170f Merge pull request #502 from ArchieBeepBoop/hunter2
Cursed Blood Trait (fixed)
2020-09-27 05:35:43 +01:00
kevinz000
0f750932e2 playing with fire will get me roasted 2020-09-25 13:13:29 -03:00
Dip
bf11aa68dc fix 2020-09-25 11:00:36 -03:00
Dahlular
a6648fa822 Revert "Cursed Blood Trait" 2020-09-25 06:23:51 -06:00
Dip
67b9e33eeb damage 2020-09-24 17:30:52 -03:00
Dip
f48a70f1c9 less prob because it was spammy af 2020-09-24 16:42:01 -03:00
Dip
fe85e4afea commit 2020-09-24 16:36:27 -03:00
QuoteFox
324dd8327d Merge pull request #487 from ArchieBeepBoop/runtimefixes
Let's play the game of experimental runtime fixes.
2020-09-24 11:25:54 +01:00
Dahlular
cfa6e536c8 Merge pull request #489 from Chemlight/Lightweight-Trait
Lightweight trait
2020-09-23 19:23:26 -06:00
Chemlight
decfb768e2 Lightweight trait
A lightweight trait that was ported from skyrats, gives you twice the drunk power from drinks, watch what you down with each swig!
2020-09-23 00:11:54 -07:00
Dip
72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip
9aa6a44267 Eldritch Affairs Port 2020-09-20 20:26:15 -03:00
Dahlular
6be7a731f1 Some fixes + Neuters Growth Serum 2020-09-14 03:06:44 -06:00
JaySparrow
322c6a3147 Formaldehyde works now
One unit of formaldehyde stops organ decay. Like how everyone thought it worked but didn't.
2020-09-12 04:13:50 -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
Vladin Ampora
5cddfc861e Who are you? Where am I?
funny drinks shit hahahahaahaahahdbwdeuwfhfof
2020-09-06 05:23:02 -04: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
jjpark-kb
026f5d8129 adds back moth eating 2020-07-20 14:11:41 -04:00
JaySparrow
2a87252114 Synthliz toxin
It was pointed out that this was missing. Here ya go.
2020-07-18 18:53:03 -05:00
Dahlular
756aa7b2af Merge pull request #321 from Jay-Sparrow/Husk-Fix
Husks and donuts
2020-07-15 22:17:07 -06:00
JaySparrow
8ef0e74ec9 Husks and donuts
Fixes various dehusking methods, and also donut crafting.
2020-07-14 19:35:27 -05:00
Dahlular
dfaf49573a Merge pull request #317 from Chemlight/Make-Virology-Great-Again
Reverse Engineering Virology from Beeviro
2020-07-14 17:04:38 -06:00
Chemlight
ee62657a24 Reverse Engineering Virology from Beeviro
Attempted to fix virology as the current addition/changes were incomplete with the individual working on it just disappearing and just leaving it in it's current state, this change will revert back virology to the old system with the old symptoms and stats as it was before. (hopefully)
2020-07-13 15:57:22 -07:00
Chemlight
82d6695faf MutationToxinAdditionFix
Changed species/moth to species/insect
2020-07-08 02:30:54 -07:00
Chemlight
f0f54ba80e Additional species mutations w/ green extracts
Provides additional effects to the current green extract when injected with different chemicals. This is to provide ways back to one's original species since for a while Lizardpeople were the only ones who had this luxury along with humans, while slimes just got bonuses.

Sulfur > Mammal
Oxygen > Avian
Water > Aquatic
Sulphuric Acid > Xeno Hybrid
Ammonia > Moth
Crocin > Felinid
Oil > IPC
2020-07-07 21:13:16 -07:00
CygnusB
d173446a9f Merge remote-tracking branch 'upstream/master' 2020-06-25 01:22:55 -03:00
CygnusB
fff888bf20 lmao wataur 2020-06-25 00:59:13 -03:00
Dahlular
64cc766b1a Merge pull request #284 from Kabramen/glass_milk_&_cum
New sprites for glass of milk and semen
2020-06-17 05:11:07 -06:00
Kabra_men
0bc9c56892 New sprites for glass of milk and semen 2020-06-16 20:08:17 -03:00
JaySparrow
d115c1e4ac Bluespace Patch Patch
Fixes the ability to use the thread on an item that already been made roomy, and makes the spool way smaller so you can put it into a box.

Also, gives the spool more uses so that it lasts the shift, and makes it so towels have the "roomy" flag innately so you can always use them to cover your bits in a pinch.
2020-06-16 16:39:59 -05:00
Improvedname
78786b28da ff 2020-03-22 19:17:51 +01:00
Improvedname
f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Dahlular
0074c18915 Merge pull request #211 from zeskorion/master
keepin beeviro porting consistent for ya
2020-03-03 00:16:29 -07:00
zeskorion
b8522cc0c7 adds special honey 2020-02-27 12:14:39 -08:00
zeskorion
7b0c0b6244 Update others.dm 2020-02-12 10:04:25 -08:00
zeskorion
04a1f58d3b FUUUUUCK
I made a pr to change this, but apparently the pr didnt change anything?? I don't know what the fuck is up with that
2020-02-06 20:38:59 -08:00
Azarak
dea2f73497 Drink updates 2020-02-03 20:23:39 +01:00
Dahlular
5305e1a4ba Merge pull request #177 from Azarak/neurotoxin
Re-adds neurotoxin and adds neurosmash
2020-02-01 07:22:22 -07:00
Azarak
b50237fd02 Re-adds neurotoxin and adds neurosmash 2020-01-29 23:41:17 +01:00
zeskorion
e5daa44ee0 Update glass.dm 2020-01-28 18:51:20 -08:00
zeskorion
53599f827a Update others.dm 2020-01-28 18:50:40 -08:00
zeskorion
80a4cbed37 FUCK 2020-01-28 18:48:30 -08:00
zeskorion
5d6474e080 fuck 2020-01-28 18:46:53 -08:00
zeskorion
5a4d5389ee motherfucking citchems 2020-01-28 18:45:34 -08:00
zeskorion
29062af741 Update glass.dm 2020-01-09 22:16:47 -08:00
zeskorion
dda5a9b426 Update others.dm 2020-01-09 22:15:58 -08:00
zeskorion
a6d82f778c Update other_reagents.dm 2020-01-09 22:11:07 -08:00
quotefox
375bfcb76e Revert "Merge pull request #138 from Code-Cygnet/master"
This reverts commit 30ed0ecef2, reversing
changes made to 11b772557b.
2020-01-03 23:55:28 +00:00
quotefox
30ed0ecef2 Merge pull request #138 from Code-Cygnet/master
Captain cocktail
2020-01-03 23:03:09 +00:00