56 Commits

Author SHA1 Message Date
Dahlular f45b4bfb4c MultiZ Layenia Base 2022-09-04 10:32:31 -06:00
Dahlular b487573064 Revert "Finally, MultiZ Layenia" 2022-07-09 13:52:49 -06:00
Dahlular e51460cb5d Revert "Merge branch 'master' into fairylights"
This reverts commit 2947727659, reversing
changes made to 91063fe882.
2022-07-09 04:55:33 -06:00
Dahlular eaaca202a6 Revert "(CONFIG CHANGE) Updating Economy: Adding Paychecks, and makes Bank Accounts easier to work with" 2022-07-06 16:38:30 -06:00
Dahlular c7c6e2d193 Merge branch 'master' into economy-update-junk 2022-07-06 16:28:45 -06:00
Archie 26c33b2403 Fixing Poss Voidsuits 2022-07-03 23:38:43 -03:00
DragonTrance 7bae2a36ee config junk 2022-06-09 17:54:40 -04:00
DragonTrance a256ef54c0 changes the price of everything to scale w/ pay 2022-06-08 18:38:41 -04:00
Kabramen 5c34380148 Handrail and Bathrobes 2021-12-30 14:19:20 -03:00
Dahlular 5019b2a197 Removes some racist garbage. 2021-10-06 13:56:22 -06:00
Archie 15b3d37b14 Fixes an extra "|" 2021-08-25 20:04:27 -03:00
ArchieBeepBoop d5a37c18a3 Merge pull request #11 from Moltovz/posshim
Adds Posshim's Corpus clothing. Ready To Merge
2021-08-25 19:58:03 -03:00
Moltov 56521e22ea final change, he wants to merge mine now 2021-08-25 00:05:58 -04:00
Moltov 2597baefc5 digileg fix 2021-08-24 23:22:25 -04:00
Moltov 83dae7a924 updates cold protection
just in case
2021-08-24 20:41:32 -04:00
Moltov 49f862a847 Adds Posshim's Corpus clothing.
DNM
2021-08-24 17:48:50 -04:00
faaaay 10f65e1cc9 Adds departmental winter coats to loadout lists, adds cold protection to jackets
Pre-existing winter coats can now be taken in loadouts.

/toggle/ jackets now grant the same cold protection as winter coats.
2021-06-25 23:29:23 +01:00
Dahlular bee97fa7b4 Adds 4 different flannel types 2021-05-08 02:20:31 -06:00
QuoteFox 58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
lukevale ea20010c14 Winter labcoat and virgin killer! 2021-03-20 15:17:03 -05:00
Chemlight 659f3b7885 Donator items for Enzo_Leon
Includes a shirt, jacket, and plushie
2021-02-13 14:56:45 -08: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 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
Vladin e9aa0f67c8 I am a wizard, not a baboon brandishing a stick.
Any wizard bright enough to survive for five minutes was also bright enough to realize that if there was any power in demonology, then it lay with the demons. Using it for your own purposes would be like trying to beat mice to death with a rattlesnake.
2021-01-31 21:31:57 -05:00
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
CygnusB edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Archie c6466270e7 Nukes bluespace thread 2021-01-09 19:40:17 -03:00
Lin b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Vladin ec989eefe0 Revert "Revert "fucking digi""
This reverts commit 31dc2dceeb.
2021-01-03 19:41:47 -05:00
Vladin 31dc2dceeb Revert "fucking digi"
This reverts commit 5c737c6c1e.
2021-01-03 19:37:12 -05:00
Vladin 5c737c6c1e fucking digi
this should fix the bs coat for digi
2021-01-03 19:33:58 -05:00
Vladin 03e081662c fucking seclites
i knew it was too good to be true
2021-01-03 19:23:18 -05:00
Vladin 1965387bea Blueshield Shit
adds blueshield uniform and coat. also should fix paramedic uniforms.
2021-01-03 19:19:16 -05:00
Chloe Carver-Brown c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Dip 99d5f2f43b Fuck monochrome, polychrome is now the deal 2020-11-10 20:50:28 -03:00
JaySparrow 8240f5d0a7 Big bits
Cram em in
2020-11-02 04:25:02 -06:00
kevinz000 fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
QuoteFox 88bf85f2ea Merge pull request #619 from ArchieBeepBoop/fixesyee
Seemingly Fixes the offset blood overlay
2020-10-27 02:35:50 +00:00
ToonClyde 4207015199 CitRP Fluffy Jackets 2020-10-26 14:30:59 -07:00
deathride58 d9db5e0aa9 Merge pull request #9246 from Linzolle/taur
some missing icons + sprite changes for taur suits
2020-10-25 21:18:42 -03:00
Dip 9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Vladin 5504a9e9da I was going to be a nurse but I don't like asking permission
saved 2 people ran over 40 lets fucking gooooooooo
2020-10-16 15:52:43 -04:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Unknown 4e272b9cf4 blue yeen's request
pink sec winter coat, BDSM whip + riding crop now inflict arousal damage on all intents + have special interaction if you target the groin (ass), slutbelt now can carry flashbangs/grenades + classic batons
2020-09-05 17:13:33 -05:00
Unknown 853cf6952e a lot of fuckin clothes
Slutty sec skirt, sec stripper outfit, 2 armor bikinis, knee-high jackboots, and a beret. I think this is enough for now.
2020-09-03 22:21:34 -05:00
QuoteFox 9a1b29e23f Addes a admin spawn apron to the kinkmate
Addes a admin spawn apron to the kinkmate
2020-07-26 23:54:42 +01:00
Dahlular 0172b30847 Green is cringe
fuck you
2020-06-05 00:41:18 -06:00