Commit Graph

6295 Commits

Author SHA1 Message Date
tkdrg
0c55904f2a Merge pull request #15623 from Core0verload/runtime
Fixes a spacewalking runtime
2016-02-20 10:00:05 -03:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
c0
0bb0c58e6d Fixes a spacewalking runtime 2016-02-19 13:20:09 +03:00
duncathan salt
db5c47b6b2 Merge pull request #15598 from Incoming5643/ape_escape_2
Adds the new pun pun to the maps
2016-02-19 04:09:18 -06:00
duncathan salt
ad11039232 Merge pull request #15568 from PKPenguin321/patch-13
Pisses off the cleanbots
2016-02-18 18:00:21 -06:00
Incoming5643
611248a4f8 Fixes Travis 2016-02-18 18:27:35 -05:00
Incoming
dd8b4f5568 Adds a bunch of ape names from the forum/previous pull.
Adds a rare pet list for some of the most supreme of meme names.
2016-02-18 12:08:45 -05:00
AnturK
56d2a34201 Splits beds and chairs
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
tkdrg
2934e6c8b7 Merge pull request #15165 from xxalpha/urange
ultra range again
2016-02-17 21:32:38 -03:00
tkdrg
2b96cbbdce Merge pull request #15574 from KazeEspada/Bagfixes
Bag tweaks.
2016-02-17 21:29:05 -03:00
PKPenguin321
fc9bf6479c changes proc to acid_act(), adds more messages
cleanbots will rise
2016-02-17 15:50:13 -08:00
duncathan salt
b8946d608e Merge pull request #15480 from bgobandit/kitty
Cats now display a variety of catlike behaviors!
2016-02-17 17:07:05 -06:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
Cheridan
9c4d90c72c Merge pull request #15564 from Incoming5643/ape_escape
Pun Pun has gained a few persistence save file features
2016-02-17 12:42:37 -06:00
xxalpha
238329dba3 Removed mecha pilots from event; added no loot syndies 2016-02-17 15:05:21 +00:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
PKPenguin321
cebb046145 adds sfx, tweaks damage, changes proc to apply_damage()
known bugs: apply_damage isn't properly accounting for armor
2016-02-16 18:21:45 -08:00
phil235
2dd476f13e Fixes shaking someone resting not making them stand up.
Fixes shaking someone not reducing the sleeping var if the mob asleep is buckled to stand up.
Fixes merge conflict issues.
Fixes my revive code leaving the revived AI blind.
2016-02-17 01:23:36 +01:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Cheridan
c1a1e90ca7 Merge pull request #15536 from optimumtact/spidersspiderseverywhere
Don't allow every single spider to be player controllable
2016-02-16 15:47:15 -06:00
KazeEspada
5d8d5854f9 Bag tweaks.
Department Backpacks are now the default(instead of grey backpacks).

Fixed an error on humans where new humans would have an integer for their backpack.

This will not affect current preferences.
2016-02-16 14:03:35 -07:00
PKPenguin321
4a326e35a0 gives cleanbots a new emag function
they kill people now
2016-02-16 00:33:23 -08:00
Incoming
f61707c6f9 Pun Pun has gained a few persistence save file features
Whatever Pun Pun is wearing on his/her head and face at round end will still be there at the start of the next round. Back and hands do not save for obvious balance reasons.
If Pun Pun dies but leaves an intact corpses his/her successor will be named Pun Pun II and inherit the items his corpse was wearing at the end of the round.
If Pun Pun gets gibbed the chain of monkeys is broken and the next round monkey will be a new progenitor with a potentially different name. Obviously their items won't be saved in this case.
2016-02-15 21:20:29 -05:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes
Fixes blindness overlay after reviving.
2016-02-15 23:17:55 +01:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
Incoming
57c9c08bef Merge branch 'master' of https://github.com/tgstation/-tg-station into I_dont_know_why_Im_doing_this_but_its_not_your_job_to_stop_me
# Conflicts:
#	code/modules/mob/living/simple_animal/parrot.dm
2016-02-14 17:57:03 -05:00
Incoming5643
4d199e699d adds speech_shuffle_rate as a var
speech_shuffle_rate will also raise when poly is fed a cracker to help cut down on line repetition
2016-02-14 17:46:15 -05:00
tkdrg
9e74538509 Merge pull request #15490 from octareenroon91/patch-37
Parrot-Cracker Balance
2016-02-14 19:41:31 -03:00
Incoming5643
431421b2f2 Take cares of minor suggested code tweaks 2016-02-14 17:17:41 -05:00
octareenroon91
610f2b47ba Now requires 20 crackers to go from 1% to 100% speak_chance. 2016-02-14 15:34:07 -06:00
tkdrg
911e1b2b21 Merge pull request #15496 from phil235/FinalBorgStunFix
Fixes runtime when borg try to reduce its weakened var.
2016-02-14 12:50:05 -03:00
phil235
ff371a5ea3 Let's not remove the mob from dead mob list if we're not actually reviving them. woops 2016-02-14 15:32:22 +01:00
phil235
e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing)
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
2016-02-14 15:26:46 +01:00
phil235
5a96cf86ad Merge branch 'master' of https://github.com/tgstation/-tg-station into HatMaskFacialHairFixes
Conflicts:
	icons/mob/suit.dmi
2016-02-14 00:22:53 +01:00
phil235
fd16e02cdb Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.
Fixes not seeing glasses through the riot helmet.
Fixes gas mask protruding from the abductor helmet.
Fixed radiation hood not hiding your hair, earpiece, mask.
Fixes colored justice hats not having an on-mob icon_stat.
Removed BLOCKHAIR bit from var/flags , moved it to flags_inv and renamed to HIDEHAIR
Added HIDEFACIALHAIR bitflag so certain hat/helmet can show just the beard.
Fixed human/update_inv_glasses not checking if our mask hides our glasses.
Fixed check_obscured_slots() not checking if our masj obscur our glasses.
Fixes some bits of flags_inv having the same value.
Fixes crusader hood and other headgear not hiding your identity when they should.
Fixes drone mask icon not appearing.
2016-02-14 00:03:07 +01:00
bgobandit
74d4d73181 so it turns out \his doesn't work if you meme at me about this I swear to fuck 2016-02-13 17:15:28 -05:00
bgobandit
d5c2d2b9c0 Merge branch 'master' of https://github.com/tgstation/-tg-station into kitty 2016-02-13 16:50:09 -05:00
bgobandit
635c86e1ee kitty fixes 2016-02-13 16:01:18 -05:00
Thunder12345
0ddd4e3c82 Cyka blyat 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
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
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
phil235
93a173122b Fixes runtime when borg try to reduce its weakened var. 2016-02-13 16:18:17 +01:00
octareenroon91
0871755a3f Parrot-Cracker Balance
The chance to NOT talk will now exponentially decay for every cracker offered.
2016-02-13 01:12:47 -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