Commit Graph

24282 Commits

Author SHA1 Message Date
tkdrg
704c00aafe Merge pull request #15479 from AnturK/lathe_fix
Fixes autolathe search
2016-02-13 22:11:22 -03:00
tkdrg
a7ba087517 Merge pull request #15478 from neersighted/remiepls
Repath janicarts/secways/atvs
2016-02-13 22:10:53 -03:00
tkdrg
c52a3e88d4 Merge pull request #15447 from KorPhaeron/holy_weapons
Three more chaplain weapons
2016-02-13 17:29:47 -03:00
tkdrg
13c16271d6 Merge pull request #15464 from AnturK/holo_fixes
Holodeck fixes
2016-02-13 17:28:14 -03:00
tkdrg
2bb9ced33f Merge pull request #15471 from Firecage/fixesbiobags
This fixes biobags picking up slime cores/extracts.
2016-02-13 17:25:59 -03:00
tkdrg
a144f70319 Merge pull request #15476 from phil235/ClonePodEjectFix
Fixes clonee in crit not falling down when ejected from the cloning pod.
2016-02-13 17:25:22 -03:00
Thunder12345
0ddd4e3c82 Cyka blyat 2016-02-13 20:11:58 +00:00
Thunder12345
1861e65bdd Stechkin buff 2016-02-13 20:11:58 +00:00
Thunder12345
7b6c6b3356 Added 7.62x38mmR ammo box with 14 rounds 2016-02-13 20:11:58 +00:00
Thunder12345
cac7a6eddf Sprites for APS and nagant 2016-02-13 20:11:58 +00:00
Thunder12345
142bef3304 Oops forgot to make the APS unsuppressable 2016-02-13 20:11:58 +00:00
Thunder12345
e6da13511a Adds russian officer uniform
Adds russian officer
Minor tweaks
2016-02-13 20:11:58 +00:00
Thunder12345
b5c79e3781 Adds military russian
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
2016-02-13 20:05:51 +00:00
Thunder12345
b9fcf72e12 Added 9mm stechkin APS, 12 round magazine, 3 round burst fire or semi auto. 2016-02-13 20:05:51 +00:00
Thunder12345
3cc300e075 Changed ranged russian's gun to nagant revolver
Makes mosin carrying russian a subtype instead of a 50% chance on a normal ranged russian
2016-02-13 20:05:51 +00:00
Thunder12345
0c81fa7519 Adds a bunch of parent calls to children of /gun/projectile so they can be suppressed correctly. Nagant revolver now properly accepts suppressors. 2016-02-13 20:05:51 +00:00
Thunder12345
f4f227412f Added nagant revolver, and its new ammo type 2016-02-13 20:05:51 +00:00
AnturK
e5bfff0cc9 Merge pull request #15393 from LanCartwright/needsallcures
Adds var/needs_all_cures
2016-02-13 19:07:19 +01:00
tkdrg
e7af997785 Merge pull request #15441 from phil235/BrainChanges
Brain fixes and changes
2016-02-13 13:29:37 -03:00
tkdrg
be59d324b3 Merge pull request #15448 from Shadowlight213/wouldyouliketoplayasshadewouldyouliketoplayasshade
Makes shade ghost poll respect prefs and cultist bans
2016-02-13 13:27:53 -03:00
tkdrg
06d89ada99 Merge pull request #15457 from MrStonedOne/patch-152
Makes get_area faster
2016-02-13 13:26:18 -03:00
duncathan salt
c8d4d58124 Merge pull request #15424 from Firecage/humansuit
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
2016-02-13 10:22:34 -06:00
Jordie
5e1ae24966 Merge pull request #15456 from neersighted/gotta_go_fast
Ignore most slowdowns in space
2016-02-13 17:36:06 +11:00
Jordie
12b804f3e7 Merge pull request #15455 from neersighted/derp
Prevent monkies/animals from picking up intercoms
2016-02-13 17:35:55 +11:00
Bjorn Neergaard
205809c25f Unanchor gibtonite, fix up some pull code 2016-02-13 00:26:28 -06:00
Jordie
3746a65f2e Merge pull request #15454 from neersighted/whoops
Fix deconstructing crates/lockers/closets
2016-02-13 17:22:49 +11:00
Bjorn Neergaard
14606bea5e Add back path_compatibility.dm
At the request of @RemieRichards
2016-02-13 00:11:05 -06:00
tkdrg
d1ddb1d763 Merge pull request #15385 from KorPhaeron/inquisitor
Inquisitor Armour
2016-02-13 00:27:36 -03:00
tkdrg
f471977904 Merge pull request #15425 from Zerrien/conveyorChanges
Buildable corner conveyor pieces and rotating built conveyor pieces using a wrench
2016-02-13 00:21:21 -03:00
tkdrg
93f0d71b7f Merge pull request #15438 from Shadowlight213/Antagfollow
Adds follow links to antags in the check antag panel.
2016-02-13 00:18:00 -03:00
tkdrg
b230117223 Merge pull request #15439 from Malkevin/implants2
Tracking Implants
2016-02-13 00:17:09 -03:00
tkdrg
53002ec035 Merge pull request #15444 from Fox-McCloud/martial-fix
Fixes Sleeping Carp Grabbing
2016-02-13 00:13:09 -03:00
Remie Richards
3cf176610e Fixes old species conversion code being incorrect 2016-02-13 02:06:03 +00:00
Joan Lung
24e2082086 Merge pull request #15437 from KazeEspada/backpackssatchelsdufflebagsohmy
Departmental Bags and Dufflebags.
2016-02-12 20:37:14 -05:00
Cheridan
f0aae210c7 Merge pull request #15370 from PKPenguin321/patch-16
Separates Traitor EMP Flashlights from the EMP Kit, reduces TC prices (Remake)
2016-02-12 19:13:05 -06:00
tkdrg
5bb6880df2 Merge pull request #15440 from Ultimate-Chimera/XenoStuff
Makes it so xenos make a hissing sound with the *hiss emote.
2016-02-12 21:40:43 -03:00
tkdrg
fa287ee090 Merge pull request #15146 from Buggy123/patch-13
Adds cable coils to autolathe
2016-02-12 21:39:40 -03:00
AnturK
7f8dc6710f Fixes autolathe search 2016-02-13 00:55:58 +01:00
Buggy123
5788e89ffa Added cable coils to the autolathe
Cable coils will only be built in stacks of 30, at maximum.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Fixed it not compiling?

Finally got it to compile

Fixes bad code

removed unnecessary /var

Added maxstack var to define custom stack sizes for things

Allowed the autolathe to use custom stack sizes.

Adds correct maxstack values to various stackable objects
2016-02-12 18:17:34 -05:00
Bjorn Neergaard
80515f1d38 Repath janicarts/secways/atvs
Remove the path compability in favor of true pathing
2016-02-12 17:10:00 -06:00
tkdrg
bc073db38f Merge pull request #15477 from Fox-McCloud/declaring-war
[s]Fixes Nuke Ops Exploit
2016-02-12 19:49:08 -03:00
Fox-McCloud
8bb4b8c494 [s]Fixes Nuke Ops Exploit 2016-02-12 17:40:06 -05:00
phil235
dab224ef2c Fixes clonee in crit not falling down when ejected from the cloning pod. 2016-02-12 22:31:07 +01:00
phil235
74e8bbf029 Fixes defibbed corpse not getting blind overlay despite being in crit.
Brain mobs that are beaten to death can still be inserted inside a brainless human corpse but defibbing the corpse cannot work (the brain is too damaged). On the other hand cloning that corpse will still work.
Deffibing a brainless corpse no longer gives "further attempts may be successful".
Fixes brain mob's container var not being nullified on Destroy().
2016-02-12 21:47:22 +01:00
Firecage
69569c4f81 merge conflict fix 2016-02-12 21:20:19 +02:00
Firecage
96f438552b This fixes biobags picking up slime cores/extracts. 2016-02-12 21:02:47 +02:00
Cheridan
c78f327100 Merge pull request #15432 from phil235/ChaplainHoodFix
Fixes masks appearing above the chaplain hood.
2016-02-12 12:38:35 -06:00
tkdrg
313f2e9b41 Merge pull request #15431 from ChangelingRain/punchstun
Fixes basic martial arts not checking the species punch stun threshold.
2016-02-12 14:37:14 -03:00
tkdrg
a9cb902368 Merge pull request #15413 from phil235/CryoResistFix
Fixes resisting out of cryo not working
2016-02-12 14:35:43 -03:00
tkdrg
e0979bd010 Merge pull request #15394 from AnturK/rnd_opt
RnD Optimization
2016-02-12 14:33:09 -03:00