Commit Graph

163 Commits

Author SHA1 Message Date
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
7f0f7dfa32 Merge branch 'master' into departmentalclothes 2021-07-20 17:16:43 +01:00
kevinz000
865ff4fa08 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2021-07-15 17:43:18 -03:00
faaaay
d1d8535256 Merge branch 'master' into departmentalclothes 2021-07-15 20:06:30 +01:00
faaaay
85aee88860 Merge branch 'master' into departmentalclothes 2021-07-03 10:43:08 +01:00
Archie
c26d02207a Merge remote-tracking branch 'upstream/master' into fuck512 2021-06-28 03:32:04 -03:00
kevinz000
470cb0a588 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2021-06-25 21:06:34 -03: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
Archie
bbdfa25c63 why the fuck do we have 2 suit_digi files 2021-06-21 19:50:26 -03:00
QuoteFox
8f765f63a5 Merge pull request #1221 from Kabramen/radkini
Engislut
2021-06-06 19:50:30 +01:00
Kabra_men
6ea19bb7d2 Engislut 2021-06-02 18:20:06 -03:00
Chloe Carver-Brown
7eb73ca903 pog 2021-05-27 16:40:15 +01:00
Dahlular
4872af2742 Merge pull request #1184 from lyricalpaws/icon_upgrades
ID Icons redux lets fucking go this took too long
2021-05-23 00:36:12 -06:00
Dahlular
62bed91cc3 Merge pull request #1179 from lyricalpaws/lets-go-mining
Mining balance changes, some new icons, and good stuff.
2021-05-23 00:32:26 -06:00
Chloe Carver-Brown
659695ea75 ID Icons redux lets fucking go this took too long 2021-05-21 22:57:23 +01:00
Chloe Carver-Brown
8872b20c42 Woah! 2021-05-20 10:34:18 +01:00
ToonClyde
b1f3782c5a cyberpunksleek/modern sweater 2021-05-17 00:36:51 -07:00
Dahlular
bee97fa7b4 Adds 4 different flannel types 2021-05-08 02:20:31 -06:00
QuoteFox
ec796b47c2 Merge branch 'master' into Kristopher-Uniform-Patreon 2021-04-27 19:28:13 +01:00
Chemlight
b6ecf59798 TouchinFuzzy Patreon uniform reward
As it says in the title, patreon reward for a high donator
2021-04-26 08:01:17 -07:00
Chloe Carver-Brown
83cbca5f07 But if you close your eyes 2021-04-15 12:25:18 +01:00
QuoteFox
58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
QuoteFox
a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
QuoteFox
b949054b1f Merge pull request #1048 from CapnMachaddish/anti-wazard-gear
Anti wazard gear
2021-03-24 22:08:03 +00:00
CapnMachaddish
72a3bc12a6 gloves 2021-03-23 14:05:05 -05:00
QuoteFox
38b5e5b0eb locker and jumpsuit equip sounds. 2021-03-23 16:27:18 +00:00
lukevale
ea20010c14 Winter labcoat and virgin killer! 2021-03-20 15:17:03 -05:00
DragonTrance
def2c053df junior job sechud icons + remove unnecessary bits 2021-02-27 21:00:43 -07: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
Vladin
1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -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
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