Commit Graph

665 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
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -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
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
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
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
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -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
CitadelStationBot
dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) 2017-08-13 01:28:16 -05:00
CitadelStationBot
3f562c113c get_head_slots() now returns wear_neck 2017-08-13 01:27:54 -05:00
LetterJay
73426d56ea file path fix 2017-08-12 06:31:50 -05:00
LetterJay
805aa06807 adds bear tails/ears to humans as well 2017-08-09 11:23:09 -05:00
LetterJay
dc502b99a6 Merge pull request #2314 from Citadel-Station-13/upstream-merge-29753
[MIRROR] Makes dummy humans queue instead of harddel
2017-08-09 02:22:33 -05:00
LetterJay
9e0b151240 Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768
[MIRROR] Standardized CENTCOM spelling
2017-08-09 02:20:26 -05:00
LetterJay
470b19b1c1 Merge pull request #2302 from Citadel-Station-13/upstream-merge-29769
[MIRROR] fixes some initialize errors
2017-08-09 02:20:14 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
2004d399c9 Makes dummy humans queue instead of harddel 2017-08-08 22:26:10 -05:00
CitadelStationBot
764ebb2e5e Fixes the Hierophant not spawning its crusher trophy 2017-08-08 22:24:01 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
b11bfa2d94 fixes some initialize errors 2017-08-08 09:05:39 -05:00
LetterJay
7b4cbf7784 adds bear ears and bear tail 2017-08-08 07:19:30 -05:00
CitadelStationBot
1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot
90a7ead961 [MIRROR] The AI's internal camera functions better (#2219)
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
2017-08-05 10:24:58 -07:00
CitadelStationBot
a840e9cf05 Fixes shields not blocking alien hunter pounces (#2249) 2017-08-04 08:43:57 -07:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot
402c4f70ca Fixes Initialize errors for type /mob/living/simple_animal/parrot (#2258) 2017-08-04 08:41:28 -07:00
CitadelStationBot
7f8249535b Fixes Initialize errors for type /mob/living/simple_animal/butterfly (#2257) 2017-08-04 08:41:20 -07:00
CitadelStationBot
9449004c36 Gives an initialize hint to stacks, boxes, closets and bots (#2256) 2017-08-04 08:41:04 -07:00
CitadelStationBot
d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
2017-08-03 06:12:27 -07:00
CitadelStationBot
1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214)
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot
cfa77cdc18 apperance ---> appearance (#2218) 2017-08-03 06:03:25 -07:00
CitadelStationBot
91a44d4c35 Makes cyborg remote interaction limited. (#2230) 2017-08-03 06:02:15 -07:00
CitadelStationBot
6f855fbd52 Adds another planetstation mob, the "Seedling" (#2233) 2017-08-03 06:01:28 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00