Commit Graph

17225 Commits

Author SHA1 Message Date
Trilbyspaceclone
70c7894155 Update emergency.dm 2019-10-21 17:20:44 -04:00
Trilbyspaceclone
6379807370 Update armory.dm 2019-10-21 17:10:48 -04:00
kappa-sama
4767a91ad2 Update _techweb.dm 2019-10-21 17:04:47 -04:00
Linzolle
32e863ac80 slightly less band-aidy way to do it 2019-10-21 14:12:09 -05:00
kevinz000
cbf7509749 Merge pull request #9536 from r4d6/patch-2
Change the SEVA suit & Exo-suit's descriptions
2019-10-21 11:16:56 -07:00
nik707
ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
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
BlackMajor
959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Ghommie
015789ac45 fixes invisible men. 2019-10-21 10:08:48 +02:00
kevinz000
4a28b7ea2d Merge pull request #9547 from Ghommie/Ghommie-cit250
Fixes silicons being unable to use the teleporter and records consoles from a distance
2019-10-21 01:07:27 -07: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
Putnam
0a000f3165 Division by zero. 2019-10-21 01:05:18 -07:00
kevinz000
84c5de29f7 Merge pull request #9537 from Hatterhat/patch-2
Magnetic Pistols Fit In Boots
2019-10-21 01:05:13 -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
Putnam
770d95ce83 rename indifferent to balanced
also, remember ur spaces
2019-10-20 19:05:24 -07:00
Putnam
d1326398dd make extended vote majority instead of plurality 2019-10-20 19:00:22 -07:00
Putnam
933e4c5812 grammar 2019-10-20 18:57:25 -07:00
Putnam
07064298b0 Dynamic voting (draft) 2019-10-20 18:54:17 -07:00
Linzolle
6ddd1181a8 paper code is weird rn 2019-10-20 16:53:47 -05:00
Ghommie
ef35aefe4e Fixes recycler deleting all clothing for mobs found inside items (e.g. bluespace bodybags) 2019-10-20 15:41:48 +02:00
Ghommie
6ae9349dfe Fixes temporary transformation sting triggering heart attacks on heartless humans. 2019-10-20 15:27:19 +02:00
Ghommie
1e669f25a4 Fixes identity transfer not copying digi legs. 2019-10-20 13:43:35 +02:00
Ghommie
7e9298d5ac Fixing radio emotes conflict with drunk memes. 2019-10-20 12:21:21 +02:00
Ghommie
12192de0cd also records consoles. 2019-10-20 10:14:50 +02:00
Ghommie
bcd6902f06 Fixes silicons being unable to use the teleporter console from a distance. 2019-10-20 10:08:58 +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
kevinz000
9c8356d9ea Update defib.dm 2019-10-19 20:48:55 -07: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