Commit Graph

13867 Commits

Author SHA1 Message Date
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
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
tkdrg
e7af997785 Merge pull request #15441 from phil235/BrainChanges
Brain fixes and changes
2016-02-13 13:29:37 -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
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
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
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
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
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
AnturK
dcf5bfb273 Holodeck fixes 2016-02-12 14:03:36 +01:00
Bjorn Neergaard
e041ced3d1 Fix jetpack runtime 2016-02-12 00:25:25 -06:00
Bjorn Neergaard
8bad6c72b9 Ignore most slowdowns in space
Which applied even when using a jetpack, nerfing their
speed outside of turbo mode

@KorPhaeron need your input, not sure about the logic
of this because it was so tangled when I first
refactored this file...
2016-02-12 00:12:51 -06:00
Zerrien
b01365ebee Unobtuses the move direction update function 2016-02-11 21:01:46 -08:00
phil235
7416962f2a woops, brain still need to die when beaten. 2016-02-12 02:32:36 +01:00
phil235
c507036408 no need to stand still. 2016-02-12 02:20:22 +01:00
phil235
a0855f2693 Brains can no longer be blinded, even when inside a MMI.
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
2016-02-12 02:04:14 +01:00
Ultimate Chimera
115aefebe3 Makes it so xenos make a hissing sound with the *hiss emote. 2016-02-11 17:48:37 -07:00
Remie Richards
8c9c061bd0 Adds auto conversion of older backbag options to the new options.
Fixes erroneous indenting of species correction (Species correction should happen in ALL versions, not just those below version 9
2016-02-12 00:27:30 +00:00
Remie Richards
44b2344925 Merge branch 'backpackssatchelsdufflebagsohmy' of https://github.com/KazeEspada/-tg-station into fucking_kaze 2016-02-12 00:13:03 +00:00
Shadowlight213
3527e8830f Adds follow links to antags in the check antag panel. 2016-02-11 16:05:27 -08:00
KazeEspada
42a3ace123 Makes it so a bad savefile(IE: an old one) uses the default backpack. 2016-02-11 17:05:16 -07:00
KazeEspada
653902068e You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags.
And for all you baystation fans, I added leather satchels while I was at it.

Minor change: Atmos techs now start with engineering bags.
2016-02-11 16:48:08 -07:00
AnturK
7d30ceb425 Merge pull request #15404 from phil235/AlienWeakenedFix
Fixes alien's weakened var never decreasing.
2016-02-11 23:27:24 +01:00
AnturK
d47b43107d Merge pull request #15405 from phil235/VisionDisposalFix
Fixes vision bug with disposal.
2016-02-11 23:25:44 +01:00
AnturK
b62988b284 Switches known_designs/tech to associative list. 2016-02-11 20:25:23 +01:00
phil235
43962ef288 Fixes masks appearing above the chaplain hood.
Fixes pirate captain coat hiding the jumpsuit despite having an opening in its center.
I removed the hood part appearing on the icon of the suits that have toggleable hoods, so there's no more confusion between the suit layer and the head layer.
2016-02-11 19:52:33 +01:00