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
44a6652d0a
Merge pull request #9696 from Yoshax/morewizardfixes
...
Makes scrying orb only usable by wizards
2015-06-06 05:03:50 +09:30
GinjaNinja32
16faba0f7c
Merge pull request #9692 from Baystation12/dev-freeze
...
Dev freeze
2015-06-05 20:32:30 +01:00
Yoshax
7b19c85ac5
Makes file use user and not usr
2015-06-05 19:04:11 +01:00
PsiOmegaDelta
2da0a5e979
Merge pull request #9690 from Kelenius/ofPuffsAndCleaner
...
Of puffs and cleaner
2015-06-05 20:02:08 +02:00
Yoshax
afe081d836
Makes scrying orb only usable by wizards
2015-06-05 18:35:19 +01:00
Kelenius
345cd7a738
Adds a simulated check to chempuffs
2015-06-05 19:20:46 +03:00
Zuhayr
589aecd40e
Merge pull request #9691 from Baystation12/master
...
master into dev-freeze
2015-06-05 21:41:58 +09:30
Chinsky
19e0a94c17
Merge pull request #9686 from PsiOmegaDelta/150605-DontDoThat
...
Removes some qdel:s of lists.
2015-06-05 15:10:53 +03:00
Chinsky
f163650cb2
Merge pull request #9652 from mwerezak/inflatable
...
Corrects comment, multiz stub, no-zone default
2015-06-05 14:48:30 +03:00
Kelenius
2ba5fd6af2
Merge branch 'dev-freeze' into ofPuffsAndCleaner
...
Conflicts:
code/game/objects/effects/chem/water.dm
2015-06-05 14:36:15 +03:00
Chinsky
e1d6af1d27
Fixes #9352
2015-06-05 14:30:01 +03:00
Chinsky
e3f64178c8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade
2015-06-05 13:24:03 +03:00
PsiOmegaDelta
979b6adcae
Removes some qdel:s of lists.
...
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02: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
PsiOmegaDelta
c21985f39d
Merge pull request #9679 from GinjaNinja32/humans_are_not_hats
...
Removes briefcase instastun and crappy helmet check
2015-06-05 10:17:02 +02:00
Zuhayr
36d8b9169b
Merge pull request #9659 from PsiOmegaDelta/150604-Shuffle
...
The shuffle proc can now handle both normal and associative lists.
2015-06-05 17:37:38 +09:30
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
Zuhayr
c3c40ed7f5
Merge pull request #9665 from PsiOmegaDelta/150604-DatumPool
...
Fixes #9664 .
2015-06-05 17:36:31 +09:30
GinjaNinja32
67ccb6997b
Entirely removes briefcase instastun and pointless New() definition
2015-06-05 09:00:19 +01:00
GinjaNinja32
90153ada91
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/objects/effects/spiders.dm
2015-06-05 08:52:44 +01: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
74cbb2c5d8
Merge pull request #9672 from PsiOmegaDelta/150604-qdel
...
Garbage/qdel changes.
2015-06-05 10:36:23 +03:00
PsiOmegaDelta
8794a90d05
The shuffle proc can now handle both normal and associative lists.
2015-06-05 07:56:20 +02:00
GinjaNinja32
2507a8007b
Comments out a section that requires a single object to be both /mob/living/carbon/human and /obj/item/clothing/head
2015-06-05 01:10:15 +01:00
GinjaNinja32
28a1bad9c4
Travis, reverts non-spanclass change
2015-06-05 00:58:13 +01:00
GinjaNinja32
63ea8338fb
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/ZAS/Diagnostic.dm
code/game/machinery/computer3/laptop.dm
code/game/machinery/requests_console.dm
code/game/objects/items/stacks/tiles/plasteel.dm
2015-06-05 00:49:13 +01:00
GinjaNinja32
e44a4805f2
Merge pull request #9663 from PsiOmegaDelta/150604-StackFixes
...
Stack splitting and cable merging fixes.
2015-06-04 23:19:08 +01: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
Chinsky
bf53304fec
Splits setup.dm into berjillion of smaller files vaguely named thematically.
...
Also moved __HELPERS and _defines around so defines actually come first.
2015-06-04 21:51:58 +03: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
PsiOmegaDelta
224cbb41bf
Garbage/qdel changes.
...
Moves atom/Destroy() into atom/movable/Destroy(). Is now a /tg/ copy-paste.
Means deleting turfs no longer wipes everything on that turf and that pulling is canceled.
qdel no longer willingly accepts lists.
2015-06-04 19:32:05 +02:00
Dennok
05b4c97e1a
fix #9666
...
up
2015-06-04 18:46:27 +03:00
PsiOmegaDelta
6fb1ea85e1
Adds a notice to StaffWho that adminhelps are also sent to IRC.
2015-06-04 15:21:42 +02:00
PsiOmegaDelta
2373eb4bdd
Fixes #9664 .
...
Datum pool no longer creates a new object just for the sake of it when initializing pool lists.
Also bandaids an issue where water could be qdeled while being sprayed and reagents nulled, because someone calls spawn() qdel in new.
Datum pool now also adds excess pool objects on the trash pile instead of calling del directly.
2015-06-04 14:42:39 +02: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
7168c9b064
Spiderlings now inherit color and light from egg clusters, spiders inherit from spiderlings.
2015-06-04 09:50:43 +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
