DragonTrance
3ebb7488de
Merge branch 'master' into plant-adding
2021-02-21 12:06:48 -07:00
DragonTrance
84d8e1a44f
Update organic.dm
2021-02-21 11:01:51 -07:00
DragonTrance
c729c61765
added tons of botany changes from citadel (not instability)
2021-02-21 09:57:29 -07:00
DragonTrance
24cb27b67c
#5
2021-02-21 08:37:10 -07:00
QuoteFox
7d7c6fedc9
asay notifications
...
for admins.
2021-02-21 11:40:02 +00:00
Chloe Carver-Brown
63063ecd9b
It liiiiiives
2021-02-20 14:48:12 +00:00
QuoteFox
1326cf32eb
Merge pull request #980 from lyricalpaws/clustaur
...
Clustaur grenades
2021-02-20 06:32:18 +00:00
QuoteFox
940a6b0ade
Merge pull request #979 from lyricalpaws/master
...
Lets people change the engravings on zippos
2021-02-20 06:31:59 +00:00
Chloe Carver-Brown
a38a978f70
Revert "Poggers"
...
This reverts commit 389291b46a
2021-02-19 23:35:57 +00:00
Chloe Carver-Brown
6d8d602907
Adding clustaur grenades
2021-02-19 23:21:12 +00:00
Chloe Carver-Brown
389291b46a
Poggers
2021-02-19 22:19:12 +00:00
Chemlight
600e329216
Time requirement on AI
...
I've been seeing a lot of new players jump straight into AI when really they honestly need to get some experience first before jumping into things (and possibly causing damage).
2021-02-19 03:30:27 -08:00
Chloe Carver-Brown
0699845118
Makes the sec eyepatch flashproof and use glasses
2021-02-16 04:23:20 +00:00
Chloe
eccf7b3237
Update _glasses.dm
2021-02-16 00:41:49 +00:00
Chloe Carver-Brown
c1c9b3bba2
Poggers
2021-02-15 23:47:04 +00:00
QuoteFox
c9341c27a5
Merge pull request #973 from VladinXXV/cupid
...
Amor in aura est
2021-02-14 22:52:27 +00:00
QuoteFox
c444b521e5
Compile error fix.
2021-02-14 22:11:09 +00:00
QuoteFox
794f3dedbd
hunger fixes, Water SHOULD HYDRATE NOW
2021-02-14 15:33:43 +00:00
Vladin
1bfe8bb816
love in the air
...
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
QuoteFox
ab9313cf42
Merge pull request #971 from Chemlight/Enzo-Plush
...
Donator items for Enzo_Leon
2021-02-13 23:00:45 +00:00
Chemlight
659f3b7885
Donator items for Enzo_Leon
...
Includes a shirt, jacket, and plushie
2021-02-13 14:56:45 -08:00
QuoteFox
f698f16e27
Thirst System
...
Thirst System
2021-02-13 14:44:55 +00:00
QuoteFox
8f3c7244fb
Merge pull request #965 from DragonTrance/showers
...
stop exploiting constructible showers ree
2021-02-13 11:13:45 +00:00
Vladin
a31f73a9fb
fuck you
...
fuck you x2
2021-02-12 22:35:21 -05:00
QuoteFox
61bc6d3745
Text fix for nightmares
2021-02-12 12:14:38 +00:00
QuoteFox
b955eb9991
You can now dream nightmares
2021-02-12 12:13:34 +00:00
QuoteFox
dc376ca84d
New under shirt and socks - Stockings Black and Arm Warmers
2021-02-12 10:59:02 +00:00
QuoteFox
73a2228f89
Good bye Mech EORG prepping.
2021-02-12 07:16:26 +00:00
DragonTrance
58b69503e3
#4
2021-02-11 20:02:40 -07:00
Chemlight
d47af9c25c
Syndicate stuff
...
Lets start if off right off the bat, chameleon masks from lavaland syndicate and (hopefully) space comms agents no longer have a GPS.
Flavor text for the syndicate ghost roles more tie into a don't leave rather than abandon, while hinting Kinaris is also an enemy much like NT, just not that much of a threat (think cold war).
Lastly anyone with the mind.special_role ROLE_TRAITOR will get a notification about ahelping before cryoing.
2021-02-11 05:50:58 -08:00
QuoteFox
8d63e4a8c0
fixes reading paper work from infinite tiles away
2021-02-11 08:07:21 +00:00
DragonTrance
e00a0700b1
#3
2021-02-10 15:35:26 -07:00
DragonTrance
75415bb7af
you know what, dont even deconstruct them
2021-02-10 07:33:11 -07:00
DragonTrance
d09400af15
stop exploiting constructable showers
2021-02-10 07:23:31 -07:00
DragonTrance
ed135323dc
#2
2021-02-10 07:18:26 -07:00
QuoteFox
d894134b7d
Merge pull request #964 from DragonTrance/layering-issue
...
Fixes clothing appearing over genitals
2021-02-10 13:26:37 +00:00
QuoteFox
22d0f71b6c
Fixes empty tape recorders getting stuck on pocket and belt slots
2021-02-09 10:31:38 +00:00
DragonTrance
7207063a63
hrngng booba
2021-02-08 21:19:56 -07:00
DragonTrance
187471f0af
#1
2021-02-08 19:15:44 -07:00
Chemlight
2a2979f33b
Don't touch me! (neutral trait)
...
Adds a new neutral trait called distant, kind of like apathetic but focused soly on headpats.
2021-02-08 06:27:48 -08:00
QuoteFox
a59d8090de
Merge pull request #960 from VladinXXV/wockysluuuush
...
Wocky Sluuush
2021-02-07 06:44:46 +00:00
Vladin
9e7a353816
that thang bleedin
...
wocky sluuuuuuuuush
2021-02-07 01:41:27 -05:00
QuoteFox
b90f60d3a6
Valentines flowers - Admin spawn only
...
brap cum plant.
2021-02-07 06:09:42 +00:00
Dahlular
c2435b144d
Merge pull request #945 from VladinXXV/atmosia
...
Atmos drip
2021-02-06 20:44:50 -07:00
QuoteFox
3d761e4b5f
autocorrect toggle
2021-02-07 02:57:51 +00:00
QuoteFox
9e2480fc95
autocorrect
2021-02-07 02:29:18 +00:00
Chloe
29c3c79aed
Update good.dm
2021-02-06 18:19:58 +00:00
QuoteFox
7b0a817775
Merge pull request #954 from Chemlight/Woo
...
Bundle of stuff (Silver extract, Gold extract, chameleon kits)
2021-02-06 02:49:42 +00:00
Chloe Carver-Brown
7d5e2d889b
Extremely small fix
2021-02-06 01:24:47 +00:00
Chemlight
2ebcd89c53
Bundle of stuff
...
Number one, put the size chems on the blacklist for silver slime etracts, or rather just get_random_drink proc
Second removed nurse spiders from gold slime extracts, it gets waaaaaay too crazy the times I've seen ghosts get control of off spring spider (children of the servent of the creator don't need to listen).
Third from popular request, gives syndicate agents the ability to buy chameleon kits.
2021-02-05 01:09:11 -08:00
