GinjaNinja32
5f75e3038e
Merge pull request #9710 from atlantiscze/beyond-undestructible
...
Fixes #9705
2015-06-06 20:16:17 +01:00
mwerezak
15d82778cd
Muzzle flash sets lighting instead of creating objs
...
Shooting a gun no longer generates illumination objects
2015-06-06 12:57:43 -04:00
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
Atlantis
265719b4aa
Fixes #9705
...
- Carboard now has Integrity of 10. For comparsion, wood has 25, steel 150 and plasteel 800.
2015-06-06 17:30:43 +02: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
Atlantis
8a5a969002
More Destroy()s, better implementation
...
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
2015-06-06 11:04:41 +02:00
Atlantis
b16bf61d03
Implements Destroy() for buildable SMES units.
...
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
2015-06-06 09:43:39 +02:00
Atlantis
69e0ebf71e
Implements Destroy() for organs
...
- This fixes annoying roundstart GC errors, and should fix other limb/organ related GC errors as well.
2015-06-06 07:21:34 +02:00
Atlantis
f66e5c9c94
Fixes #9619
2015-06-06 06:52:42 +02:00
Neerti
f43bd102f2
Makes the code compile.
2015-06-05 22:58:51 -04:00
Neerti
2a45114038
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/datums/supplypacks.dm
code/game/machinery/bluespacerelay.dm
code/game/machinery/hologram.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/game/turfs/simulated/walls.dm
code/global.dm
code/modules/clothing/spacesuits/rig/suits/ert.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/designs.dm
config/example/config.txt
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/rig_modules.dmi
interface/interface.dm
maps/exodus-3.dmm
polaris.dme
2015-06-05 22:11:15 -04:00
Zuhayr
f03fc826f1
Fixes #9597
2015-06-06 11:20:56 +09:30
GinjaNinja32
fb1904ef4e
Fixes a pair of null.z runtimes
...
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
2015-06-06 02:23:06 +01:00
PsiOmega
711eb0501c
Fixes #9697
...
Replaces and closes the <span>
2015-06-05 21:17:11 +02:00
Yoshax
7b19c85ac5
Makes file use user and not usr
2015-06-05 19:04:11 +01:00
Yoshax
afe081d836
Makes scrying orb only usable by wizards
2015-06-05 18:35:19 +01:00
PsiOmegaDelta
079b0af6b0
Adds spinning animation for meteors.
2015-06-05 15:55:39 +02:00
PsiOmegaDelta
bad9c103eb
Merge remote-tracking branch 'upstream/dev' into 150605-Meteors
...
Conflicts:
code/game/gamemodes/meteor/meteors.dm
2015-06-05 14:59:52 +02:00
PsiOmegaDelta
a07d20d657
Ports /tg/'s meteor implementation.
...
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
Chinsky
e3f64178c8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade
2015-06-05 13:24:03 +03:00
Chinsky
02d6e7a303
Fixes #9605
...
Now organ DNA is sync'd to newly created character.
2015-06-05 12:49:48 +03:00
PsiOmegaDelta
c3f0a46c19
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/briefcase.dm
html/changelogs/.all_changelog.yml
2015-06-05 10:39:41 +02:00
Chinsky
026500ea06
Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade
2015-06-05 11:26:25 +03:00
PsiOmegaDelta
7f9996eece
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-05 10:23:23 +02:00
Chinsky
4b04ccb05d
Axed couple unused organ flags, made them look a bit nicer with bitmove
2015-06-05 11:18:07 +03:00
Chinsky
e5a8eb2dfc
Actually renames 'going' var.
...
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03:00
Chinsky
dcf7f308f6
Merge pull request #9662 from PsiOmegaDelta/150604-SpiderGlow
...
Giant spider nurses now have a chance of injecting their victims with eggs.
2015-06-05 10:37:58 +03:00
Chinsky
ad0652d864
Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).
2015-06-04 22:51:15 +03:00
Yoshax
c960fad48e
Changes teleportation scroll and spellbook to be only usable by wizards
2015-06-04 20:21:31 +01:00
Yoshax
1711d01e7a
Makes special wizard projectile staffs only usable by wizards.
2015-06-04 19:42:06 +01:00
Karolis2011
9ff27dc038
Now when welding sorting pipe, game update it's name
2015-06-04 20:48:57 +03:00
Dennok
05b4c97e1a
fix #9666
...
up
2015-06-04 18:46:27 +03:00
PsiOmegaDelta
55bc495ee7
Some cleanup of code.
2015-06-04 14:18:13 +02:00
PsiOmegaDelta
65fc980b20
Stack splitting and cable merging fixes.
...
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +02:00
PsiOmegaDelta
5006e8160d
Spider eggs now also inherit color and light from their mother.
2015-06-04 12:19:54 +02:00
PsiOmegaDelta
dc22e8fed3
Giant spider nurses now have a chance of injecting their victims with spider eggs.
...
Spider nurses now have poison_per_bite chance (currently 10%) to inject a random non-robotic external limb with spider eggs.
These eggs will eventually hatch a number of spiderlings that will slowly grow inside their host, causing minor tox damage over time.
If the organ is removed from the host, the host dies, or the spiderling has matured sufficiently it will crawl out into freedom.
Medical scanners will register eggs and spiderlings as foreign bodies.
2015-06-04 12:13:29 +02:00
PsiOmegaDelta
0e3bc3b860
NPC mobs and blobs now attack all external human limbs.
...
When attacked by simple mobs and blobs now all external limbs are available for random selection.
The overall damage will be the same but the number of fractures caused will, in general, be fewer.
2015-06-04 09:20:02 +02:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
PsiOmegaDelta
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
PsiOmegaDelta
bb1dbe9f67
Merge pull request #9656 from Techhead0/requestConsole
...
Request Console cleanup.
2015-06-04 08:01:13 +02:00
Techhead0
0195c179ff
Request Console cleanup.
...
Changes screen and departmentType to use defines and bitflags instead of magic numbers.
Moves code from the message sender to send_rc_message().
One console's destruction no longer prevents the entire department from receiving messages.
2015-06-03 22:38:04 -04:00
PsiOmega
086517f988
Closes a span class.
...
Has somehow gone unnoticed until now.
2015-06-03 17:57:57 +02:00
Zuhayr
9d9efc336b
Merge pull request #9649 from mwerezak/fixes
...
Fixes
2015-06-03 11:45:45 +09:30
mwerezak
0777f9c998
Fixes #9648
...
Robotic limbs are no longer able to mutate.
2015-06-02 21:40:30 -04:00
GinjaNinja32
3434826eaf
Merge pull request #9490 from Zuhayr/xenoruins
...
Random map generator expansion.
2015-06-02 20:59:52 +01:00
Chinsky
807a92f6d7
Merge pull request #9647 from GinjaNinja32/eftpos
...
Fixes #9645
2015-06-02 22:42:48 +03:00
GinjaNinja32
5a2933bb4f
Fixes #9645
2015-06-02 20:39:03 +01:00
Chinsky
58d9cb24a2
Merge pull request #9632 from PsiOmegaDelta/150602-Access
...
Generalizes access definitions.
2015-06-02 22:32:11 +03:00
Zuhayr
ebe62cefd8
Refactored random map generator system and added several terrain generators.
...
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
Zuhayr
04d1b40e3d
Merge pull request #9626 from GinjaNinja32/vine_event_fix
...
Fixes vine/infestation events not working with new lighting
2015-06-03 04:00:21 +09:30