Commit Graph

5813 Commits

Author SHA1 Message Date
Zuhayr
6fff0069db Fixes # #8327 2015-06-21 01:48:15 +09:30
Zuhayr
7c1696c3c8 Fixes #9435 2015-06-21 01:27:23 +09:30
Zuhayr
f371da4ae9 Merge pull request #9838 from mwerezak/stunrevolver
Assorted small dev-freeze tweaks, stunrevolver fix
2015-06-21 01:16:58 +09:30
Zuhayr
e13c4a2243 Fixes #7828 2015-06-20 21:57:03 +09:30
HarpyEagle
ccb12556d6 Fixes #9624 2015-06-18 16:31:29 -04:00
HarpyEagle
44644d34b4 Restores stop drop and roll time
Returns the duration of stop drop and roll to 3 seconds. The amount of
removed fire stacks was reduced by ~3/5 instead of lengthening the time.
2015-06-18 12:55:31 -04:00
HarpyEagle
5c1499ff1f Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver 2015-06-18 12:54:43 -04:00
HarpyEagle
4b441bc293 Adjusts animate_tail_once duration 2015-06-18 12:53:20 -04:00
HarpyEagle
b26edd690c Certain sidearms now use the lighter gunshot sound 2015-06-17 09:59:40 -04:00
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
mwerezak
73333ac9c8 Moves metabolism to a holder subtype 2015-06-16 16:26:06 -04:00
mwerezak
70433b4367 Makes showers wash away touching reagents
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
PsiOmegaDelta
37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
93c3d03801 Merge pull request #9817 from GinjaNinja32/records
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
0423691ca2 Missed a span 2015-06-15 12:20:16 +01:00
GinjaNinja32
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
GinjaNinja32
3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
mwerezak
ad24805eb8 Mob fire temperature fix, tweaks
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.

Also made mob fires burn hotter overall and resisting slower.
2015-06-13 15:45:52 -04:00
Zuhayr
cef958cac2 Fixes #9503 2015-06-10 23:14:33 +09:30
Zuhayr
018c3fc2aa Fixes #9517 and #9542 2015-06-10 23:14:33 +09:30
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master
Dev-freeze.
2015-06-10 11:04:54 +02:00
PsiOmegaDelta
1efd3f9394 Merge pull request #9775 from mwerezak/mrowl
Fixes tajaran name generation, tweaks
2015-06-10 07:59:10 +02:00
mwerezak
58d512d1e6 Fixes tajaran name generation, tweaks 2015-06-10 00:53:24 -04:00
PsiOmega
3591bd5599 Travis now builds using version 508.1287
throw is now a keyword. Updates usages where necessary to allow compilation.
2015-06-09 15:36:27 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master
Dev-freeze
2015-06-09 12:12:40 +02:00
PsiOmega
13cb32fa7f Another MayRespawn() fix.
Being unable to reenter your body now allows you to respawn, even if your body lives.
2015-06-08 17:39:25 +02:00
GinjaNinja32
d6677d4389 Merge pull request #9739 from PsiOmegaDelta/150608-NoPowerNoControl
AI restrictions and rejuvenation.
2015-06-08 10:08:55 +01:00
PsiOmegaDelta
5d058be2e6 Merge pull request #9741 from Baystation12/master
Dev-freeze
2015-06-08 09:56:24 +02:00
PsiOmegaDelta
cad9b59c25 AI restrictions and rejuvenation.
Ensures the AI cannot use Topics() while unpowered.
Ensures the AI is properly rejuvenated by the AI verb, as a functional AI will now never be lying down.
2015-06-08 09:10:33 +02:00
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles.
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
2015-06-07 12:31:55 -04:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
2015-06-07 10:30:27 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog
Syringe gun logs, logging helper reorganization
2015-06-07 09:00:21 +02:00
Zuhayr
2eb14e037f Merge pull request #9709 from PsiOmegaDelta/150606-GhostSpawn
Fixes #9685.
2015-06-07 15:06:09 +09:30
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
PsiOmega
cbead4224b Fixes #9685.
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
2015-06-06 15:44:49 +02:00
PsiOmega
711eb0501c Fixes #9697
Replaces and closes the <span>
2015-06-05 21:17:11 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
Zuhayr
da3ee37df9 Merge pull request #9638 from PsiOmegaDelta/150602-LawSets
Allows all synths to view the alternative law sets.
2015-06-03 04:00:11 +09:30
PsiOmegaDelta
3f26eeac99 Allows all synths to view the alternative law sets.
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
2015-06-02 14:48:08 +02:00
PsiOmegaDelta
fcb0841646 Reduction of admin right-click verbs.
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627.
Fixes #9628.
2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a69d0a4f7 More MayRespawn checks.
Astral projecting wizards/cultists may no longer respawn as something else.
2015-06-02 13:40:53 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
End game tweaks
2015-05-31 23:55:08 +03:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46 Re-adds extended oxygen tanks to relevant jobs. 2015-05-31 14:08:46 -04:00
Techhead0
99e9172d31 Cleans up Vox survival gear, adds belt icons to emergency nitrogen tanks. 2015-05-31 13:04:32 -04:00
Techhead0
3620c49b08 Fixes #9462 2015-05-31 12:41:39 -04:00
Zuhayr
bf1733640a Fixes #9586 2015-05-31 02:56:54 +09:30
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
Zuhayr
40780165a2 Merge pull request #9569 from comma/master
Fixes corpses and unconscious people still showing typing indicators.
2015-05-30 12:36:14 +09:30
Chinsky
44db730482 Fixes corpses and unconscious people still showing typing indicators.
Indicator also has same visibility as the owner, so no magicaly sensing where someone is going to talk soon (chat bubbles works well enough)
Since images do not have visibility, had to make it an object decal. Also since it's set per mob, it's no longer global. Shouldn't really be much of an issue, since it's only created when mob tries to speak (so ~60 objects total on high-usual load)
2015-05-30 03:13:45 +03:00