Commit Graph

54 Commits

Author SHA1 Message Date
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
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
Code-Cygnet
2fd4df92e7 Adds Commander and Chief 2019-12-13 15:20:30 -05:00
quotefox
964e5e0c78 Merge pull request #129 from Azarak/botanystuff
Adds in lots of botany stuff - 3d orange, fairygrass, new bioluminescence, bamboo, cherry bulbs, COCONUTs+
2019-12-12 01:42:55 +00:00
quotefox
c1bd80fc78 Merge pull request #121 from Seris02/drinks
adds sin's delight, hellfire and gunfire
2019-12-12 01:09:48 +00:00
Azarak
05f4a3163f adds in coconuts, coconut milk, coconut bongs 2019-12-10 07:21:41 +01:00
Seris02
769c1c8e8b adds sin's delight, hellfire and gunfire 2019-12-08 12:32:32 +08:00
Seris02
f294569943 fixes bottle smash and fun stuff 2019-12-05 16:12:46 +08:00
shellspeed1
be0d110713 screm 2019-11-13 01:07:35 -08:00
quotefox
fc4a4feca3 Merge pull request #71 from shellspeed1/more-plants
Adds a bunch of plants to botany
2019-11-12 00:40:37 +00:00
quotefox
96d8637892 Merge pull request #68 from shellspeed1/tweaks-superior-chems-
Tweaks oxandrolone and salicyclic acid
2019-11-12 00:29:05 +00:00
shellspeed1
8b3ee6614f massive botany changes 2019-11-11 16:22:42 -08:00
shellspeed1
c4838fc161 ups improved healing threshold from 50 to 25 damage. 2019-11-11 10:37:33 -08:00
shellspeed1
1713d7c569 adds recipe for prussian blue. 2019-11-11 10:25:51 -08:00
quotefox
19810f7e98 Merge pull request #59 from Azarak/master
It's me trying to fix a conflict and I've never done this don't mind me
2019-11-08 20:48:47 +00:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA
aaaaaaaa
2019-11-04 23:20:16 +01:00
quotefox
bbfb448536 Merge pull request #43 from shellspeed1/tricord-balance
makes od deal 1/4th of damage
2019-10-25 17:08:27 +01:00
shellspeed1
48f06aa113 makes od deal 1/4th of damage 2019-10-23 11:16:07 -07:00
shellspeed1
5d1ed71dc2 Code work to port carpets from citadel 2019-10-19 12:02:31 -07:00
shellspeed1
0e0f5e642f Ooof 2019-10-18 13:24:24 -07:00
shellspeed1
22e7d9dee8 fixes 2019-10-15 17:10:52 -07:00
shellspeed1
984417ea63 oh god oh fuck oh god 2019-10-15 13:42:18 -07:00
shellspeed1
6a0cb72b6a error fixing 2019-10-15 11:59:46 -07:00
shellspeed1
470ec5d62b whew 2019-10-14 18:46:06 -07:00
quotefox
713fdeeade Merge pull request #33 from Azarak/master
Fixes for Stimulum and Nitryl
2019-10-14 16:49:49 +01:00
quotefox
bd718654c3 update dump! 2019-10-14 16:48:21 +01:00
Azarak
0c4a3753bd Fixes for Stimulum and Nitryl 2019-10-14 13:54:11 +02:00