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
11df2fa97a
Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding
...
Fixes jobban cache not updating on jobbans and unbans
2016-02-18 14:03:58 -03:00
884b6c3415
Chair hitsound
2016-02-18 17:55:39 +01:00
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
537ac55162
Removes excess whitespace
2016-02-18 02:37:48 -06:00
d6e6874206
Control Wand
2016-02-18 02:34:20 -06:00
309bfa0e91
Merge pull request #15418 from MMMiracles/spaceman
...
Adds several templates for space ruins
2016-02-18 01:30:13 -06:00
633cb4d1a3
Bo staff fix
2016-02-17 23:05:25 -06:00
9992a7cc7d
Tribal Knife
2016-02-17 22:37:23 -06:00
0d8a181ee7
Knife
2016-02-17 22:33:33 -06:00
cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
a2ef1ad26f
Merge pull request #15545 from Shadowlight213/defenderpref
...
Makes wizard academy defender respect prefs
2016-02-17 19:57:02 -06:00
6290022001
Merge pull request #15547 from KorPhaeron/seed_vault
...
Five lavaland ruins
2016-02-17 19:54:08 -06:00
a66e40eb9a
Merge pull request #15558 from Incoming5643/pisssh
...
Restores the old sound of windowed doors
2016-02-17 19:50:29 -06:00
bb00bd311f
Merge pull request #15513 from KorPhaeron/chaplain3
...
Four more holy weapons
2016-02-17 19:48:06 -06:00
2934e6c8b7
Merge pull request #15165 from xxalpha/urange
...
ultra range again
2016-02-17 21:32:38 -03:00
514446d6ee
Scale down dynamic wait on atmos now that the lag bug is fixed
2016-02-17 16:31:17 -08:00
2b96cbbdce
Merge pull request #15574 from KazeEspada/Bagfixes
...
Bag tweaks.
2016-02-17 21:29:05 -03:00
7d255c67db
Fucks around with fire and bomb defines.
2016-02-17 16:26:21 -08:00
0b888afc41
Merge pull request #15572 from KorPhaeron/gland
...
Adds missing punctuation to alien mindshock
2016-02-17 21:22:58 -03:00
569797531c
Fixed map
2016-02-18 00:00:07 +00:00
fc9bf6479c
changes proc to acid_act(), adds more messages
...
cleanbots will rise
2016-02-17 15:50:13 -08:00
5f2b0eae79
Merge pull request #15577 from phil235/NukeCinematicLayerFix
...
Fixes inventory things appearing above the nuke cinematic.
2016-02-17 20:49:12 -03:00
b8946d608e
Merge pull request #15480 from bgobandit/kitty
...
Cats now display a variety of catlike behaviors!
2016-02-17 17:07:05 -06:00
28b179908f
glorf
2016-02-17 16:59:56 -06:00
43207c3070
Fix police and telebatons ignoring shields
2016-02-18 02:57:32 +04:00
67aec79ecf
Weather
2016-02-17 16:28:59 -06:00
422b55d2f9
Fixes tesla southern tendency.
2016-02-17 22:52:10 +01:00
3c8652e346
Merge pull request #15504 from phil235/HatMaskFacialHairFixes
...
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
54b87e0239
Fixes typo in suit.dmi
...
Removes action button from the paranormal response unit helmet
2016-02-17 21:32:46 +01:00
e3ba907c58
Fixes certain reagent making you sleep/be stunned/blind for just a split second every time life() is called.
2016-02-17 21:20:39 +01:00
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
238329dba3
Removed mecha pilots from event; added no loot syndies
2016-02-17 15:05:21 +00:00
1bee6b5365
Merge remote-tracking branch 'upstream/master' into uhhhhh
2016-02-17 15:04:51 +00:00
d0d708fa69
spawns
2016-02-17 14:37:07 +00:00
7c0c66dba3
Merge remote-tracking branch 'upstream/master' into urange
2016-02-17 14:21:29 +00:00
f3fd49349c
Prisoner Transport
2016-02-17 06:32:32 -06:00
ea2f57e6d2
Merge pull request #15523 from optimumtact/extreme_makeover_turret_edition
...
Rearrange turret files to split out functionality
2016-02-17 11:34:02 +01:00
2f71b65fe2
fixes sprite, changes prefixes
...
double prefixes are no more. instead, it now goes sharpened, twice-sharpened, and thrice-sharpened. there should never be an item that is sharpened more than three times, which works out because there is no word that comes after thrice (thank you so much @razharas for the code for this)
a little bit of weirdness got stuck on the sprite when i first implemented it due to a goof when i removed the transparency, it is now fixed
2016-02-17 01:09:01 -08:00
4b38905555
Gives ghosts a full Security HUD.
...
Ghosts will now use the full Security HUD, instead of the AI version.
This means that:
- Ghosts will now see the arrest status
- Ghosts will also now see if the target has loyalty/tracking/chemical implants.
2016-02-16 23:10:08 -06:00
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
51de0406f4
adds sprites, tweaks damage values
...
max is now 12, down from 15
increment per block is now 4, down from 5
sprites by @newfren
2016-02-16 17:03:48 -08:00
95f825e7ed
Fixes inventory things appearing above the nuke cinematic.
2016-02-17 01:49:03 +01:00
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
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
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
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
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
aa8de1bb51
Merge pull request #15554 from Menshin/autolathe_stacks_fix
...
Fix autolathe merging on top stacks without checking for types
2016-02-16 13:22:23 -06:00
8f776c2cd8
Missing punctuation
2016-02-16 11:34:51 -06:00
Incoming
tkdrg
AnturK
KorPhaeron
Cheridan
Kyle Spier-Swenson
xxalpha
PKPenguin321
duncathan salt
Lo6a4evskiy
AnturK
phil235
GunHog
KazeEspada