Commit Graph

10561 Commits

Author SHA1 Message Date
nik707 671fdf32c9 Merge pull request #9520 from r4d6/master
Allow Humans, Felinids, Slimepersons and Lizardpeoples to have Decorative Wings just like Mammals
2019-10-21 10:24:30 -05:00
kappa-sama 6fe65368f6 roboticists can have some love 2019-10-21 10:00:52 -04:00
kappa-sama d7c6950788 scientists can now buy alien tech disk
this isn't a bad idea i swear
2019-10-21 09:30:11 -04:00
kappa-sama 211a3f2f93 bad humor
what am i doing
2019-10-21 09:29:42 -04:00
Anonymous 2078fdae66 GOD--
--DAMN IT!
2019-10-21 16:26:31 +03:00
kappa-sama 797d6b4795 copy paste spaghetti
forgive me
2019-10-21 09:23:33 -04:00
kappa-sama 3077d538ec makes alien tech unlocking more consistent
and also makes them cost more and require more relevant research to get, as well as decreasing their export price
2019-10-21 09:21:48 -04:00
kappa-sama b728050882 alien research disk
e
2019-10-21 09:15:11 -04:00
Anonymous 32d2476112 Moves stuff from modular, updates sprites
Also, digitigrade variant is corrected, hopefully.
2019-10-21 15:24:06 +03:00
Putnam 296ce4fb78 suggested changes 2019-10-21 05:18:44 -07:00
Putnam 74ca1a9ccf concept: actually let admins do it 2019-10-21 04:56:06 -07:00
Putnam da7d4345b5 Added a toggle dynamic vote verb for admins. 2019-10-21 03:18:27 -07:00
Ghommie 760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
Ghommie 015789ac45 fixes invisible men. 2019-10-21 10:08:48 +02:00
kevinz000 814f91ee8e Merge pull request #9545 from Ghommie/Ghommie-cit248
Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears"
2019-10-21 01:07:00 -07:00
kevinz000 9e63413911 Merge pull request #9466 from deathride58/yawnborgs
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-21 01:04:34 -07:00
kevinz000 838575da50 Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-21 00:59:58 -07:00
kevinz000 c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
kevinz000 3d24d18622 Update soulstone.dm 2019-10-20 21:27:34 -07:00
Linzolle 6ddd1181a8 paper code is weird rn 2019-10-20 16:53:47 -05:00
Ghommie 6ae9349dfe Fixes temporary transformation sting triggering heart attacks on heartless humans. 2019-10-20 15:27:19 +02:00
Ghommie 7e9298d5ac Fixing radio emotes conflict with drunk memes. 2019-10-20 12:21:21 +02:00
Ghommie 964372b047 Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears" 2019-10-20 09:34:16 +02:00
Ghommie ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Ghommie ca1e4b6e65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235 2019-10-20 07:29:32 +02:00
Ghommie 8cd93f2085 bad. 2019-10-20 07:28:04 +02:00
Trilbyspaceclone 656ff4d943 Lowers exotic carpet to 7k from 10k 2019-10-20 00:18:11 -04:00
YakumoChen e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChen 6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChen 61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChen 37f58798ab no crafting 2019-10-20 03:05:21 +00:00
kevinz000 8a8e36ba1c Update uplink_items.dm 2019-10-19 20:01:21 -07:00
kevinz000 659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2019-10-19 19:52:21 -07:00
r4d6 49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
deathride58 f72d058eb5 makes borg flashes actually take eye protection into account 2019-10-19 17:57:05 -04:00
Linzolle eb1e064c49 oh yeah surgeon 2019-10-19 10:48:30 -05:00
Ghommie fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
Linzolle 39788c8216 fix abductors 2019-10-18 23:45:13 -05:00
Linzolle c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Poojawa c7e1449a3c re-adds blood crate 2019-10-18 06:02:23 -05:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Ghommie a57911b88a null lists type mismatch 2019-10-18 11:19:24 +02:00
Ghommie 281f4e29dc Fixes some peculiarities with hands layer overlapping stuff 2019-10-18 10:23:43 +02:00
TrilbySpaceClone 1707d6e6d2 er? 2019-10-18 01:22:19 -04:00
TrilbySpaceClone 18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
Linzolle 5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
kevinz000 a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
Linzolle 380e5a2be7 Merge remote-tracking branch 'deco-wings/master' into wingcolors 2019-10-17 19:27:34 -05:00
Linzolle b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00