Commit Graph

1298 Commits

Author SHA1 Message Date
QuoteFox 3ca1dfecda Merge pull request #984 from DragonTrance/plant-adding
Fixes gaia not being applied to trays correctly
2021-02-22 04:11:42 +00:00
DragonTrance d7644adb8c hopefully fix 2021-02-21 21:10:33 -07:00
QuoteFox 1c509bd31e Roleplay Warning smite. 2021-02-22 00:54:05 +00:00
QuoteFox 711e52cc09 compile errors fixed. 2021-02-21 23:54:50 +00:00
DragonTrance 3da00de2cd opaque > transparent 2021-02-21 14:22:46 -07:00
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
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
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
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 ed135323dc #2 2021-02-10 07:18:26 -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
QuoteFox 3d761e4b5f autocorrect toggle 2021-02-07 02:57:51 +00:00
QuoteFox 9e2480fc95 autocorrect 2021-02-07 02:29:18 +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
Chloe Carver-Brown bc315a750c Finally bring languages 2021-02-05 03:22:57 +00:00
QuoteFox 5abf25a745 Merge pull request #949 from quotefox/ecom-2
vending fix, wallet fix
2021-02-04 23:41:10 +00:00
QuoteFox b39881f441 vending fix, wallet fix
vending fix, wallet fix
2021-02-04 23:40:40 +00:00
QuoteFox 51b1ddfd9e Merge pull request #947 from quotefox/ecom-2
loose ends.
2021-02-04 14:47:05 +00:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox 6ec0c56d5a Merge pull request #946 from quotefox/ecom-2
Hyper Economy part 2 - Civ Vendors
2021-02-04 13:13:19 +00:00
QuoteFox c0de8ec3ac some prices and lights I forgot. 2021-02-04 13:10:16 +00:00
QuoteFox 2253473cc5 we dont use this anymore
we dont use this anymore
2021-02-04 12:47:09 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
Dahlular 443294d345 Merge pull request #942 from VladinXXV/patch-1
the absolute state of my mind
2021-02-01 16:10:42 -07:00
kevinz000 c71ab9b1a2 Merge pull request #11087 from Ghommie/Ghommie-cit579
Fix for solar panels/trackers being wonky.
2021-02-01 20:03:09 -03:00
Vladin Ampora b2917ae057 Update costumes_toys.dm 2021-02-01 06:47:59 -05:00