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
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
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
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
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
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
Zuhayr
9d9efc336b
Merge pull request #9649 from mwerezak/fixes
...
Fixes
2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551
Fixes #9640
2015-06-02 22:00:34 -04:00
GinjaNinja32
3434826eaf
Merge pull request #9490 from Zuhayr/xenoruins
...
Random map generator expansion.
2015-06-02 20:59:52 +01:00
Chinsky
58d9cb24a2
Merge pull request #9632 from PsiOmegaDelta/150602-Access
...
Generalizes access definitions.
2015-06-02 22:32:11 +03:00
GinjaNinja32
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01: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
PsiOmegaDelta
2514c56c01
Merge pull request #9642 from comma/cryopod
...
Saves rank and time too in cryopod logs.
2015-06-02 20:17:08 +02:00
PsiOmegaDelta
3988d6ac90
Merge pull request #9388 from Techhead0/prisonBreak2.0
...
Refactors and expands the Prison Break event.
2015-06-02 18:58:20 +02:00
GinjaNinja32
314a28fa75
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/OpTable.dm
code/game/machinery/floodlight.dm
code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
PsiOmegaDelta
88b80732e7
Generalizes access definitions.
...
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
2015-06-02 18:11:46 +02:00
Chinsky
f8cfd491f7
Now with radios
2015-06-02 18:38:49 +03:00
Chinsky
5ed365d96b
Saves rank and time too in cryopod logs.
...
It's usually very hard to guess who all those people are on pure name list, and purging records screws over investigations enough as it is :<
2015-06-02 18:34:47 +03:00
Chinsky
c873825a42
Fixes #6029
2015-06-02 14:27:16 +03:00
Chinsky
87c32af3dc
Fixes #9545
2015-06-02 14:00:39 +03:00
Zuhayr
dadc434f4e
Ported action button system from Paradise/tg
2015-06-02 17:17:13 +09:30
PsiOmega
3d49ad3927
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/jobs/job/job.dm
code/game/jobs/job/silicon.dm
code/game/objects/items/weapons/surgery_tools.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/organs/organ_external.dm
icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
Techhead0
637135b0b5
Removes relative pathing, adds better comments.
2015-06-01 00:02:56 -04:00
Techhead0
2b8d6db61e
Refactors Prison Break event.
...
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
2015-05-31 23:25:52 -04:00
Chinsky
ff592c751a
Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
...
End game tweaks
2015-05-31 23:55:08 +03:00
GinjaNinja32
d5e0a60a6b
Merge pull request #9566 from PsiOmegaDelta/150529-Doors
...
Fixes #9559 .
2015-05-31 20:11:33 +01:00
GinjaNinja32
c1cc002109
Merge pull request #9601 from Techhead0/survivalBox
...
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2
Removes O2 tank and spare mask from Vox boxes.
2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46
Re-adds extended oxygen tanks to relevant jobs.
2015-05-31 14:08:46 -04:00
Techhead0
aa2564b798
Fixes #9556
...
Also fixes missing backpacks for assistants.
2015-05-31 14:03:41 -04:00
Techhead0
3620c49b08
Fixes #9462
2015-05-31 12:41:39 -04:00
Chinsky
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d
Added MATERIAL_PADDING flag.
2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f
Merge pull request #9582 from mwerezak/robolimbs
...
limb fixes
2015-05-31 17:14:25 +09:30
Zuhayr
1a4f3952d1
Cosmetic fixups.
2015-05-31 17:10:49 +09:30
mwerezak
d541fda7be
Sets w_class for external organs
...
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
PsiOmega
2f1202d5e0
Airlock fixes.
...
Changes door closing to use the same sound playing setup as door opening. Fixes #9559 .
2015-05-30 20:41:25 +02:00
