Commit Graph

1858 Commits

Author SHA1 Message Date
LetterJay
de009b5283 Merge pull request #2374 from sirelgate/master
xenomorph round start update
2017-08-15 10:20:57 -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
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
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
LetterJay
3876ecab9e Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853
[MIRROR] critical priority roleplay grammatical patch (*surrender emote fix)
2017-08-13 09:52:46 -05:00
LetterJay
d3e8815788 Merge pull request #2350 from Citadel-Station-13/upstream-merge-29864
[MIRROR] Fixes minebots missing action icons
2017-08-13 09:51:45 -05:00
LetterJay
81dc5d2c09 Merge pull request #2349 from Citadel-Station-13/upstream-merge-29826
[MIRROR] get_head_slots() now returns wear_neck
2017-08-13 09:51:29 -05:00
CitadelStationBot
dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) 2017-08-13 01:28:16 -05:00
CitadelStationBot
714fc5ed4a Fixes minebots missing action icons 2017-08-13 01:27:58 -05:00
CitadelStationBot
3f562c113c get_head_slots() now returns wear_neck 2017-08-13 01:27:54 -05:00
CitadelStationBot
6cb9a0088f Fixes admin mass deleting... not actually mass deleting... 2017-08-13 01:26:39 -05:00
LetterJay
f615bc0dff Merge pull request #2342 from Citadel-Station-13/bear-fix
Bear ears/tails fix
2017-08-12 07:05:38 -05:00
LetterJay
c00f0a99f0 Merge pull request #2335 from ktccd/Flavor-elevator
Refactored flavortext to be savable in DNA. (RIP old changeling-meta-hunting)
2017-08-12 06:35:45 -05:00
LetterJay
1520c4facd Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800
[MIRROR] Massively improves downloading/viewing logs.
2017-08-12 06:34:41 -05:00
LetterJay
962d983079 Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746
[MIRROR] Fixes adminhelp sending the wrong message to players
2017-08-12 06:33:29 -05:00
LetterJay
73426d56ea file path fix 2017-08-12 06:31:50 -05:00
Poojawa
5a7126a0dd Panic Bunker for moderator/trialmin access 2017-08-12 01:15:42 -05:00
ktccd
4188db53a5 Flavortext transition finished
Now properly moves OLD flavortext to the new format and then removes the
old format.
If no old format is found, it defaults to loading the new format.
Flavortext is now stored in your DNA, and is loaded into your characters
flavor_text variable upon creating the character or messing with the
DNA.
This allows cloners/pods/changelings to use the correct flavortext.
2017-08-11 23:48:46 +02:00