Commit Graph

1873 Commits

Author SHA1 Message Date
LetterJay
2b9f59ca3d bonesless pizza 2017-08-16 15:06:16 -05:00
LetterJay
c627cec04a Merge pull request #2388 from sirelgate/master
Xeno Fix, Nerfing them.
2017-08-16 13:51:06 -05:00
Haresay
6f20e222d3 xenofix 2017-08-16 11:55:40 -06:00
Haresay
aaaecf731c xenonerfs 2017-08-16 11:35:36 -06:00
Haresay
e06288d41a Xenonerfs 2017-08-16 10:31:03 -06:00
LetterJay
b3e984af5b Update furrypeople.dm 2017-08-16 09:41:55 -05:00
LetterJay
95cfe5baa0 Update browserOutput.dm 2017-08-15 19:48:26 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
d133510288 Update preferences_savefile.dm 2017-08-15 19:06:41 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
Haresay
67cd217681 bumped heat damage after calculating armor 2017-08-15 10:19:38 -06:00
CitadelStationBot
3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
Haresay
b65234b733 rebalanced armor downward, removed stunmod, and made more vulnerable to heat thanks to Pierceimmune being added 2017-08-15 09:33:31 -06:00
Haresay
7eaaa2e647 lowered armor value,in search of fixing digitigradelegs 2017-08-15 09:25:51 -06:00
Haresay
93ae8c0e44 did some number crunching in regards to armor and practiced, balanced more, still no shoes from digitgrade 2017-08-15 09:21:08 -06:00
LetterJay
de009b5283 Merge pull request #2374 from sirelgate/master
xenomorph round start update
2017-08-15 10:20:57 -05:00
LetterJay
6539ccf061 Merge pull request #2379 from Citadel-Station-13/upstream-merge-29888
[MIRROR] Makes IRC status return round id
2017-08-15 10:14:56 -05:00
LetterJay
6cad8ecacd Merge pull request #2378 from Citadel-Station-13/upstream-merge-29384
[MIRROR] Deathsquads no longer get shielded hardsuits
2017-08-15 10:14:35 -05:00
LetterJay
49e4f8675c Merge pull request #2377 from Citadel-Station-13/upstream-merge-29890
[MIRROR] Fixes mining hardsuit heat_protection
2017-08-15 10:12:29 -05:00
CitadelStationBot
f6babfeb8a Makes IRC status return round id 2017-08-15 10:01:57 -05:00
CitadelStationBot
313ba00dd5 Deathsquads no longer get shielded hardsuits 2017-08-15 09:59:51 -05:00
Haresay
1cc9a1decf set xeno standard parts to be default 2017-08-15 08:06:59 -06:00
Haresay
22ad3c6afe xeno markings addition
added markings to the xenomorph, for polish
2017-08-15 08:03:08 -06:00
CitadelStationBot
402b9a6cab Fixes mining hardsuit heat_protection 2017-08-15 05:55:57 -05:00
CitadelStationBot
3b1a0a0dc0 Fixes Singulo, Tesla, Reality Breaks, & Narsie being frozen by freon 2017-08-15 05:11:08 -05:00
LetterJay
905cb4a3e8 Merge pull request #2278 from Citadel-Station-13/upstream-merge-29651
[MIRROR] Fixes hair sticking through hats.
2017-08-14 20:48:21 -05:00
LetterJay
31b501aa1a Merge branch 'master' into upstream-merge-29885 2017-08-14 19:41:45 -05:00
LetterJay
bda5e94afc Merge pull request #2365 from Citadel-Station-13/upstream-merge-29886
[MIRROR] Fix compile warning
2017-08-14 19:41:03 -05:00
LetterJay
1d4e15502a Update browserOutput.dm 2017-08-14 19:40:45 -05:00
LetterJay
77025ae8a2 Merge branch 'master' into upstream-merge-29651 2017-08-14 19:37:09 -05:00
LetterJay
f2c011a37b Update console.dm 2017-08-14 18:55:25 -05:00
LetterJay
e5cd79a14e Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
[MIRROR] Moved can_trigger_gun to item/weapon parent
2017-08-14 18:53:38 -05:00
LetterJay
6d62d51eab Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
[MIRROR] Hallucinations 3.0
2017-08-14 18:45:45 -05:00
LetterJay
ce918273bc Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779
[MIRROR] Fixes the Hierophant not spawning its crusher trophy
2017-08-14 18:45:28 -05:00
LetterJay
9b57f5fd62 Update collectable.dm 2017-08-14 18:39:22 -05:00
LetterJay
46c6a54a75 Update misc.dm 2017-08-14 18:38:55 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
Haresay
048c782156 xenomorph update
A long overdue overhall and readdition of xenos
2017-08-14 17:09:11 -06:00
CitadelStationBot
97243fca3a Moved can_trigger_gun to item/weapon parent 2017-08-14 16:05:43 -05:00
LetterJay
822cddc718 Update Hallucination.dm 2017-08-14 08:55:45 -05:00
LetterJay
80bb075eb3 Update Hallucination.dm.rej 2017-08-14 08:24:58 -05:00
LetterJay
fdfdd4fc21 Update admin_investigate.dm 2017-08-14 08:24:34 -05:00
LetterJay
cb861b28ca Merge pull request #2367 from Citadel-Station-13/upstream-merge-29841
[MIRROR] Makes the ahelp topic give the permissions warning
2017-08-14 08:21:38 -05:00
LetterJay
7c6f9c4973 Merge pull request #2363 from Citadel-Station-13/upstream-merge-29867
[MIRROR] Tweaks atmos canister lights.
2017-08-14 08:20:57 -05:00
CitadelStationBot
2476d59be6 Makes the ahelp topic give the permissions warning 2017-08-14 06:54:44 -05:00
CitadelStationBot
f840a18a9a Fix compile warning 2017-08-14 02:59:42 -05:00
CitadelStationBot
7fe8dd208d [s] Clean up some inputs 2017-08-14 02:44:24 -05:00
CitadelStationBot
726ffe1fdd Tweaks atmos canister lights. 2017-08-14 01:25:02 -05:00
CitadelStationBot
0e7b9a008e Ports a slightly edited version of Eris APC sprites 2017-08-13 17:54:27 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00