HarpyEagle
fc7e89380e
More material renames
...
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
Kearel
c146f1e324
zenghu icon fixes
2015-08-07 14:41:54 -05:00
mwerezak
9595056574
Merge pull request #10440 from Kelenius/ofGarbageAndReferences
...
Of garbage and references
2015-08-07 10:07:04 -04:00
PsiOmegaDelta
a6d9002806
Merge pull request #10442 from Baystation12/dev-freeze
...
Dev freeze
2015-08-07 10:37:47 +02:00
Kelenius
25eaeecb24
Optimizes reference finder
2015-08-07 09:28:29 +03:00
mwerezak
21648ddfd8
Merge pull request #10439 from PsiOmegaDelta/150806-Garbage
...
Crematorium Destroy()
2015-08-06 15:10:18 -04:00
Kelenius
16ca8ca768
Optimizes garbage reference searcher
2015-08-06 10:48:14 +03:00
PsiOmegaDelta
8ca5d01dcf
Crematorium Destroy()
...
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
2015-08-06 08:39:24 +02:00
PsiOmegaDelta
1b42a56f4b
Merge pull request #10438 from PsiOmegaDelta/dev
...
Dev
2015-08-06 08:23:59 +02:00
PsiOmegaDelta
863832b347
Post-merge fixes.
...
Renames define.
Re-corrects access checks.
2015-08-06 08:18:39 +02:00
PsiOmegaDelta
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
PsiOmegaDelta
87fcd408bd
Merge pull request #10436 from mwerezak/cult-construct-nightvision
...
Adds nightvision to cult constructs
2015-08-06 06:38:49 +02:00
mwerezak
0bc9468022
Merge pull request #10431 from PsiOmegaDelta/150805-HoloRuntime
...
Fixes holodeck runtime.
2015-08-05 23:06:04 -04:00
mwerezak
e5950d32d8
Merge pull request #10264 from RavingManiac/dev-freeze
...
Refactors floating and magboot checks. Fixes #10256
2015-08-05 23:05:34 -04:00
PsiOmegaDelta
77aab2ddc0
Merge pull request #10437 from GinjaNinja32/dmitool
...
Recompile dmitool.jar under Java 7 instead of Java 8
2015-08-05 23:14:29 +02:00
GinjaNinja32
76656a0cf1
Recompile dmitool.jar under Java 7 instead of Java 8
2015-08-05 21:39:59 +01:00
Kelenius
92ca942fa9
Fixes #10219 - cables don't always qdel
...
Dem snowflake code
2015-08-05 18:13:38 +03:00
Kelenius
cc83f35d72
Searches for references to hard-deleted objects
2015-08-05 18:10:41 +03:00
Chinsky
2d6bd631bf
Merge pull request #10433 from PsiOmegaDelta/150805-AccessFix
...
Fixes #10121 .
2015-08-05 15:35:50 +03:00
PsiOmegaDelta
450f3c0f31
Fixes #10121 .
...
The low-security armory now requires the same access as the doors into the area.
The EVA maintenance door now requires EVA and maintenance access (instead of EVA and id change access).
2015-08-05 14:10:58 +02:00
PsiOmegaDelta
f77b3c26c6
Merge pull request #10430 from PsiOmegaDelta/dev
...
Dev
2015-08-05 09:33:50 +02:00
PsiOmegaDelta
cf1ffd273a
Fixes holodeck runtime.
...
initial() doesn't work well with lists. Causes a null value.
2015-08-05 09:33:34 +02:00
PsiOmegaDelta
73a9c24017
Removes code in mob/living/bot/Life() that is now handled by mob/living/Life().
2015-08-05 09:26:43 +02:00
PsiOmegaDelta
3e266ab377
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-05 09:25:53 +02:00
PsiOmegaDelta
615333fa5c
Merge pull request #10429 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-08-05 09:21:01 +02:00
PsiOmegaDelta
6b01a67c50
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/admin_verbs.dm
code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
PsiOmegaDelta
6bae780da6
Merge pull request #10427 from GinjaNinja32/pai
...
pAI fix
2015-08-05 06:29:06 +02:00
GinjaNinja32
c71d78ab1a
add debug verb as pAI-spawning adminverb
2015-08-05 00:50:04 +01:00
GinjaNinja32
595b58197d
fix pAI radios not working
2015-08-05 00:49:28 +01:00
mwerezak
9ee2482fda
Merge pull request #10422 from PsiOmegaDelta/150804-SomeOfYouPeopleAreSoPicky
...
Uses raised TM symbol in the mirror name.
2015-08-04 16:27:34 -04:00
Chinsky
7a4ba68abe
Merge pull request #10419 from mwerezak/gamemode
...
Fixes #10403
2015-08-04 17:08:51 +03:00
GinjaNinja32
117ffca6d0
Merge pull request #10423 from Kelenius/ofBotsAndZAS
...
Of bots and ZAS
2015-08-04 13:26:30 +01:00
GinjaNinja32
9a4b53c765
Merge pull request #10360 from atlantiscze/beep-beep-beepsky
...
Fixes #10355
2015-08-04 12:36:35 +01:00
GinjaNinja32
384dfb0ce6
Merge pull request #10421 from PsiOmegaDelta/150804-TravisCount
...
Updates the Travis macro count.
2015-08-04 12:35:59 +01:00
PsiOmegaDelta
93011f94c4
Merge pull request #10425 from Baystation12/dev-freeze
...
Dev
2015-08-04 13:07:11 +02:00
Zuhayr
988f6bb5bd
Merge pull request #10424 from Zuhayr/dev-freeze
...
Dev freeze
2015-08-04 20:07:05 +09:30
Zuhayr
8428764338
Merge.
2015-08-04 20:02:13 +09:30
Kelenius
e935baf1d8
Fixes #10418 - bots don't remover from stuns
2015-08-04 12:41:32 +03:00
PsiOmegaDelta
4d57f5ef66
Uses raised TM symbol in the mirror name.
...
Now uses the HTML code for the trademark symbol.
2015-08-04 10:41:28 +02:00
PsiOmegaDelta
f106ea04eb
Updates the Travis macro count.
2015-08-04 08:13:57 +02:00
mwerezak
d1bd146b1a
Changes reinforced glass material name
...
Gives the reinforced glass material a name that is easier to verify for
correctness.
2015-08-03 23:01:34 -04:00
mwerezak
d25d0c700c
Fixes #10403
...
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()
Also fixes an inverted check that was preventing antags from spawning.
2015-08-03 20:01:55 -04:00
GinjaNinja32
09daf7c987
Merge pull request #10412 from PsiOmegaDelta/150803-BriefcaseLog
...
Fixes #10372 .
2015-08-04 00:47:21 +01:00
GinjaNinja32
70c302ad03
Merge pull request #10415 from PsiOmegaDelta/150803-LightingRuntime
...
Fixes #10409 .
2015-08-04 00:47:11 +01:00
GinjaNinja32
a099fc4401
Merge pull request #10413 from PsiOmegaDelta/150803-Cleanup
...
Removes debug proc.
2015-08-04 00:46:40 +01:00
PsiOmegaDelta
49b1ff5742
Merge pull request #10417 from mwerezak/gamemode
...
Fixes #10414
2015-08-03 21:57:21 +02:00
mwerezak
76ceaa904b
Fixes admin or event spawned antags not spawning
...
Pending players were selected but the antag roles were never finalized.
2015-08-03 12:06:23 -04:00
mwerezak
2e1607f611
Fixes #10414
...
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().
In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
2015-08-03 12:03:08 -04:00
RavingManiac
aeea42ded9
Refactors floating and magboot checks. Fixes #10256
2015-08-03 23:19:04 +10:00
PsiOmegaDelta
c25212463a
Fixes #10409 .
...
Ports https://github.com/ParadiseSS13/Paradise/pull/1622 .
2015-08-03 10:15:24 +02:00
