125 Commits

Author SHA1 Message Date
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
Vladin 17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
QuoteFox 07f7467daf Revert "Revert "Testing art skills""
This reverts commit 57146db436.
2021-01-26 17:58:39 +00:00
QuoteFox 57146db436 Revert "Testing art skills"
This reverts commit 52f76bd74a.
2021-01-26 17:55:04 +00:00
QuoteFox e26ed22d40 Merge pull request #927 from Chemlight/Dumb-doged-sprites
Testing art skills / more personal stuff
2021-01-26 15:37:37 +00:00
Chemlight 52f76bd74a Testing art skills
I ended up practicing some spriting with  byond's editing software, I'll have to find better methods about how to do this (like uploading a png from SAI) Regargless I liked how these all came out it was too good that not putting them in would be a waste.
2021-01-26 07:21:30 -08:00
Archie 296b08c666 nein 2021-01-21 03:33:32 -03:00
Archie f2b22cd84e Removes hat knocking off, maintains hat landing 2021-01-21 03:27:27 -03:00
Archie bc90159799 Fix hardsuits 2021-01-21 03:09:42 -03:00
Archie f22a21f8cb Revert "Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER"
This reverts commit 3c0c4c41a1, reversing
changes made to e79656c1ba.
2021-01-21 03:07:29 -03:00
Dahlular 893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
QuoteFox e79656c1ba Merge pull request #905 from MalricB/AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER
ports hat throwing
2021-01-20 13:04:18 +00:00
CygnusB 00abae18ae one more time
ye
2021-01-19 18:54:17 -03:00
CygnusB edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
QuoteFox 0d23ec3ee7 Merge pull request #881 from ArchieBeepBoop/ratswearetherats
SS13 - The Rat Update (Store mice in Chef hats + Regal Rats)
2021-01-16 03:48:26 +00:00
Chloe Carver-Brown b49dc9536a Adds footwraps as a roundstart and craftable shoe 2021-01-16 02:49:23 +00:00
Timothy Teakettle 5cca6129a5 Regal Rats + Mice in hat 2021-01-15 21:18:12 -03:00
Archie c6466270e7 Nukes bluespace thread 2021-01-09 19:40:17 -03:00
Archie 87ce4d858c Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""
This reverts commit 08c8f744a9.
2021-01-08 17:03:24 -03:00
QuoteFox 08c8f744a9 Revert "Merge pull request #838 from ArchieBeepBoop/test1"
This reverts commit b0dbacee82, reversing
changes made to 813a2ea1c7.
2021-01-08 19:28:18 +00:00
kevinz000 939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
Putnam3145 0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -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 a7ee5f4ce0 requiem
uniform no longer awkwardly caps and shit added to vendor
2021-01-03 20:10:09 -05: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
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular 3800442a32 Merge pull request #727 from ArchieBeepBoop/reagents
Ports "Refactors can_see_reagents"
2020-12-06 13:31:50 -07:00
Dahlular ede0632fbf Merge pull request #726 from MalricB/euthanasia
Ports vampires. Or, bloodsuckers, rather.
2020-12-03 19:18:47 -07:00
CygnusB cdba1458a5 THUNK THUNK THUNK 2020-12-03 16:58:42 -03:00
Lin 9677bb5104 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2020-12-02 00:57:14 -03:00
CygnusB ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dahlular 238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
Dahlular ea1a66fd8b Merge pull request #698 from ArchieBeepBoop/hev
HEV Suit Mk.I
2020-11-22 01:36:12 -07:00
Poss 6d8847db0c Update security.dm 2020-11-21 22:28:43 -05:00
Poss 3f178aaa0e Update security.dm 2020-11-21 22:21:24 -05:00
Poss c0113b87a4 Update security.dm 2020-11-21 22:20:35 -05:00
Oposshim bb1694f301 Kinaris Corp 1.1.2
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
Dahlular 79d678fe19 Merge pull request #678 from ArchieBeepBoop/teleportfixes
[Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes
2020-11-19 23:18:37 -07:00
Dip 762dd621ad HEV Suit Mk.I 2020-11-19 18:41:48 -03:00
Dahlular ac97ca4d42 Merge pull request #674 from ArchieBeepBoop/gar
Pierce the heavens with POLYCHROMIC Gar Glasses
2020-11-13 19:07:05 -07:00
kevinz000 4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00