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
HarpyEagle
1ba777f670
Reverses stunrevolver buff
2015-06-17 09:59:39 -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
PsiOmega
9d90691605
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
GinjaNinja32
8d0c7039df
Changes to dsay
...
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
2015-06-13 16:46:03 +01:00
PsiOmega
d989df7e8c
Adds the Jump-To-X verbs to the list of debug verbs.
2015-06-13 09:53:32 +02:00
PsiOmega
c2f8e1242e
Expands admin jump permissions, cuts down on superfluous feedback.
2015-06-13 08:44:58 +02:00
Zuhayr
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
PsiOmegaDelta
a0dcb04768
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
code/modules/admin/topic.dm
2015-06-11 12:06:40 +02:00
Ccomp5950
a2298df036
Merge pull request #9776 from Zuhayr/dev-freeze
...
Fixes
2015-06-10 21:40:20 -04:00
PsiOmega
2bd0d7a2f4
Automatic player note fixes.
...
Player notes should now properly include the relevant admin's ckey.
Automatically adds temporary and permanent bans to the player's notes.
2015-06-10 17:56:31 +02:00
Zuhayr
f9134028b6
Fixes #9777
2015-06-10 23:14:34 +09:30
Zuhayr
48b063a96e
Fixes #9620
2015-06-10 23:14:33 +09:30
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
Zuhayr
8a2c0226dc
Fixes #9597
2015-06-10 23:14:32 +09:30
Zuhayr
4b04b867ac
Fxes #9625
2015-06-10 23:14:32 +09:30
Zuhayr
347e6df2ac
Merge pull request #9704 from atlantiscze/clean-up-your-trash
...
[Done] Implements Destroy()'s on some things
2015-06-10 23:07:38 +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
GinjaNinja32
6950790526
Merge pull request #9767 from PsiOmegaDelta/150609-IAmTooDumbForThisTruly
...
Fixes admin jumps.
2015-06-10 03:14:00 +01:00
PsiOmega
581c9b1308
Fixes admin jumps.
...
Changes the checks and message target around, now targets usr instead of src.
2015-06-09 20:14:05 +02: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
PsiOmegaDelta
ec68454f63
Fixes #9753 .
...
Being admin jumped or jumping to another location now cancels ghost tracking.
Also adds proper permission checks.
2015-06-09 08:55:12 +02:00
GinjaNinja32
54b531c36e
Merge pull request #9743 from Techhead0/voidsuitTweaks
...
Minor tweaks to voidsuits.
2015-06-09 02:51:24 +01: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
Zuhayr
389178a9ad
Merge pull request #9745 from Kelenius/ofReagentsAndOD
...
Fixes #9738 - reagents always overdose
2015-06-08 20:43:55 +09:30
Kelenius
37f02ebc93
Fixes #9738 - reagents always overdose
2015-06-08 12:41:58 +03:00
Techhead0
f2f34b9a38
Minor tweaks to voidsuits.
...
Component removal uses a dialogue box instead of removing items in a set order.
Renames "Eject Tank" to avoid duplicate verb names.
Changes order of components when equipping voidsuits.
Two user message changes.
2015-06-08 05:30:11 -04: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
zonthori
98ca5466e2
Straight base_state
2015-06-07 13:56:11 -06:00
zonthori
ccb01cd4ed
Fixes https://github.com/Baystation12/Baystation12/issues/9728
...
Fixes custom welding helmet sprites to break when toggled.
https://github.com/Baystation12/Baystation12/issues/9728
2015-06-07 13:38:44 -06: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
Chinsky
bb824dba42
Merge pull request #9721 from atlantiscze/apcfix
...
Refactors /obj/item/apc_frame to /obj/item/frame/apc
2015-06-07 12:43:01 +03: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
Atlantis
0135051498
Fixes #9706
...
- Adds checks whether the turf exists. This should prevent runtimes.
- Moves ..() call in food/snacks/grown after seed.thrown_at() call. I believe this was causing the runtime in first place.
2015-06-07 06:43:50 +02:00
Atlantis
41d4c2eb13
Refactors /obj/item/apc_frame to /obj/item/frame/apc
...
- This fixes broken APC frame placement on walls - #9537
2015-06-07 06:26:10 +02:00
Atlantis
bb33905803
Fixes minor typo in organ Destroy()
2015-06-07 05:29:43 +02:00
GinjaNinja32
8d799293ba
Merge pull request #9701 from Zuhayr/dev-freeze
...
Fixes #9597
2015-06-07 03:14:06 +01:00