GinjaNinja32
5e2a95468a
Merge pull request #9809 from mwerezak/zonemerge-master
...
Hotfix for #9235
2015-06-13 18:47:54 +01:00
mwerezak
17a84d9dd3
Hotfix for #9235
...
Hotfix for master
2015-06-13 13:37:37 -04: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
Zuhayr
7ff2a9415a
Merge pull request #9805 from GinjaNinja32/follow-with-camera
...
Renames Track-With-Camera to Follow-With-Camera
2015-06-14 00:05:04 +09:30
PsiOmegaDelta
5f925d92c7
Merge pull request #9803 from GinjaNinja32/wizardsuit
...
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 15:25:35 +02:00
GinjaNinja32
aa3c68d3c2
Renames Track-With-Camera to Follow-With-Camera
...
Title. This means both AIs and ghosts can get space-completion for following a specific mob from 'fol', rather than AIs needing 'tra' and ghosts needing 'fol'.
2015-06-13 14:12:59 +01:00
GinjaNinja32
9613fae16a
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 13:43:51 +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
Zuhayr
b2dacae3eb
Merge pull request #9791 from GinjaNinja32/cryopod
...
Cryogenic/robotic storage now uses alt-title for announcements
2015-06-12 15:18:41 +09:30
GinjaNinja32
951a7b7347
Cryogenic/robotic storage now uses alt-title for announcements
...
Fixes #9790 .
2015-06-11 21:44:08 +01:00
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
GinjaNinja32
d31cf8f3d8
Merge pull request #9786 from LightningIron/dev-freeze
...
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
unknown
c062f886c0
Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel.
2015-06-10 22:07:52 -05:00
unknown
fe2ce02f54
Fixes #9744 .
2015-06-10 21:50:48 -05: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
Zuhayr
84ae0dd3d1
Merge pull request #9768 from LightningIron/master
...
Fixes #9731 and #9469
2015-06-10 13:35:41 +09:30
mwerezak
8007d42783
Adjusts usages of reagent transfer procs
...
Adds splash() proc for futureproofing.
Replaces instances of splash_mob() with splash()
Replaces instances of trans_to() with splash() where appropriate.
2015-06-10 00:03:08 -04:00
unknown
13a43e6cfd
Changes description update spawn() to use 0 instead of small decimal.
2015-06-09 22:35:16 -05:00
unknown
2dbd0ac007
Fixes formatting for spawn() before updating description.
2015-06-09 22:02:14 -05:00
GinjaNinja32
6950790526
Merge pull request #9767 from PsiOmegaDelta/150609-IAmTooDumbForThisTruly
...
Fixes admin jumps.
2015-06-10 03:14:00 +01:00
mwerezak
72a716b66c
Attempts to make transferring reagents a bit more logical
...
Attempts to give trans_to, touch, and trans_to_* procs more distinct
purposes.
Applying reagents to things now calls touch() before attempting to
transfer reagents.
Reagents that affect fire stacks now do so from touch. Fixes #9750 when
combined with the above.
Also fixes acid affect_touch dealing brute instead of burn.
2015-06-09 21:39:45 -04:00
unknown
b1368fb712
Changes chemgrenade time in description to be correct after failed detonation.
2015-06-09 19:51:33 -05:00
unknown
17488168ab
Fixes for #9731 and #9469 .
2015-06-09 18:49:09 -05: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
