Commit Graph

24666 Commits

Author SHA1 Message Date
kappa-sama
2f30735fcb yes
travis die
2019-10-21 20:36:17 -04:00
kappa-sama
259946b496 kill travis
travis die
2019-10-21 20:35:10 -04:00
BlackMajor
b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88
buffs c4 on mobs
2019-10-22 11:04:30 +13:00
BlackMajor
a2bb6bb07a Merge pull request #9417 from Citadel-Station-13/kevinz000-patch-91
REVS!!
2019-10-22 11:01:20 +13:00
BlackMajor
c901f796f8 Merge pull request #8963 from Citadel-Station-13/kevinz000-patch-61
healing holoparasites now heals toxlovers
2019-10-22 10:50:04 +13:00
kappa-sama
4767a91ad2 Update _techweb.dm 2019-10-21 17:04:47 -04:00
CitadelStationBot
ffa98e9da9 Automatic changelog generation for PR #9536 [ci skip] 2019-10-21 13:16:59 -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
CitadelStationBot
7ba8b55942 Automatic changelog generation for PR #9524 [ci skip] 2019-10-21 10:57:48 -05:00
nik707
8090d58baf Merge pull request #9524 from Linzolle/wingcolors
Colorable decorative wings
2019-10-21 10:57:45 -05:00
CitadelStationBot
3940128897 Automatic changelog generation for PR #9525 [ci skip] 2019-10-21 10:26:55 -05:00
nik707
6a9d8f1981 Merge pull request #9525 from Linzolle/angel-wings
Fix decorative angel wings icon
2019-10-21 10:26:53 -05:00
nik707
ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
CitadelStationBot
d1b8dc58d2 Automatic changelog generation for PR #9520 [ci skip] 2019-10-21 10:24:32 -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
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
kappa-sama
901be0d04a update master
up
2019-10-21 09:02:44 -04:00
CitadelStationBot
1d4b76e10a Automatic changelog generation for PR #9547 [ci skip] 2019-10-21 03:07:29 -05: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
CitadelStationBot
0d749e53bd Automatic changelog generation for PR #9545 [ci skip] 2019-10-21 03:07:03 -05: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
CitadelStationBot
43f429c58c Automatic changelog generation for PR #9537 [ci skip] 2019-10-21 03:05:15 -05:00
kevinz000
84c5de29f7 Merge pull request #9537 from Hatterhat/patch-2
Magnetic Pistols Fit In Boots
2019-10-21 01:05:13 -07:00
CitadelStationBot
2963ff6a80 Automatic changelog generation for PR #9466 [ci skip] 2019-10-21 03:04:37 -05: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
CitadelStationBot
68cdc6c050 Automatic changelog generation for PR #9503 [ci skip] 2019-10-21 03:00:00 -05: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
kappa-sama
aacbb0ec8a dunk
grunk
2019-10-20 21:27:40 -04: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
kevinz000
c59f15a8bc Merge pull request #9529 from BlackMajor/Yeet
Syndicate paper masks no longer work in pockets
2019-10-19 19:53:40 -07:00
CitadelStationBot
4a63789de5 Automatic changelog generation for PR #9522 [ci skip] 2019-10-19 21:52:24 -05: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
Hatterhat
2a45cd19fb boot holster boot holster 2019-10-19 20:24:00 -05:00
r4d6
49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
kappa-sama
68dfb6939f master
monkey
2019-10-19 11:34:01 -04:00
Linzolle
c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
BlackMajor
d39897b9ad Update phantomthief.dm 2019-10-18 23:34:31 +13:00
Linzolle
f4b2c6f1eb missing wings icons 2019-10-17 23:03:50 -05:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
CitadelStationBot
9fd95537bc Automatic changelog generation for PR #9515 [ci skip] 2019-10-17 19:29:20 -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
CitadelStationBot
59cc07637e Automatic changelog generation for PR #9523 [ci skip] 2019-10-17 19:28:59 -05:00
kevinz000
e9f4757446 Merge pull request #9523 from Linzolle/surgeryfixesohboy
[s] fix advanced surgery tools not working for coronary bypass and lobectomy
2019-10-17 17:28:57 -07:00