PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
PsiOmega
6658f52ced
Merge remote-tracking branch 'upstream/master' into dev
2015-05-04 14:56:15 +02:00
PsiOmegaDelta
d86dd60c63
Merge pull request #9064 from Loganbacca/smokeFix
...
Chem smoke fadeOut sanity checks
2015-05-04 14:52:33 +02:00
RavingManiac
97adee16db
Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked
...
Lattices now spawn properly when a floor tile is destroyed by an explosion. Probabilities involved tweaked
2015-05-03 21:53:02 +10:00
PsiOmega
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
PsiOmega
46ad005b50
Adds two missing pooling instances and corrects broken grilles health status.
2015-05-02 21:46:30 +02:00
PsiOmega
ca7fa2aa19
Grilles and rods.
...
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +02:00
Chinsky
a9b1f8bfe0
Merge pull request #9042 from PsiOmegaDelta/Buttons
...
Small remote button refactor.
2015-05-02 19:50:24 +03:00
Chinsky
d5495870d1
Merge pull request #9045 from mwerezak/resist
...
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
Chinsky
8f1a9a9375
Merge pull request #9040 from PsiOmegaDelta/LOOCToggle
...
Admins can now toggle OOC and LOOC separately from each other.
2015-05-02 08:21:50 +03:00
Loganbacca
6238dabf88
Chem smoke fadeOut sanity checks
...
Ported updates from /tg/ to fadeOut code. Updates written by vista-
2015-05-02 13:33:25 +12:00
mwerezak
b10c64d48b
Adds a closet breakout animation, fixes spamming the breakout proc
2015-05-01 16:19:52 -04:00
mwerezak
98a4f54b88
Adds span classes, moves secure closet procs
2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279
Resist verb cleanup
...
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
Chinsky
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
PsiOmega
5bbe839092
Fixes an ancient bug where door buttons toggling bolts were inversed, causing the first click to do nothing.
2015-04-30 19:34:25 +02:00
PsiOmega
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
PsiOmega
904efa322f
Breaks up the remote door control button into subtypes, depending on what is remotely controlled.
...
Also ensures that the door button respects cut wires, etc.
2015-04-30 18:26:31 +02:00
PsiOmega
82a8f32783
Admins can now toggle LOOC separately from OOC.
...
Also includes what I image to be proper permission checks for toggling the various OOC channels.
2015-04-30 09:52:29 +02:00
Kelenius
4500eac948
Merge and removal of a wild file
...
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
Chinsky
34bbe33030
Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
...
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +03:00
mwerezak
fbede7a193
Minor ZAS-related cleanup
2015-04-28 23:00:56 -04:00
Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
Kelenius
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
PsiOmega
86d2fa5f61
Build fixes.
2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624
Merge pull request #9015 from Kelenius/ofChemAndOne
...
Chemistry update - part one
In spite of the sassy tone.
2015-04-28 08:39:27 +02:00
Kelenius
d9e2947b32
Updates chemistry colors
2015-04-28 09:23:39 +03:00
PsiOmegaDelta
1e457f6e34
Merge pull request #9009 from Yoshax/icanintosurgery
...
Fixes antag surgery kit
2015-04-28 07:35:58 +02:00
Chinsky
0e1a8051f8
Merge pull request #8996 from PsiOmegaDelta/SecureBuzzing
...
Now only secure airlocks buzz if access is restricted.
2015-04-28 06:26:49 +03:00
Chinsky
1328414485
Merge pull request #8960 from mwerezak/item-color
...
Fixes #8577 , cleans up item_color, clothing/under and backpacks
2015-04-28 06:25:35 +03:00
Chinsky
bf7dc5be9d
Merge pull request #8994 from PsiOmegaDelta/AirlockPressure
...
Airlocks can now crush more things.
2015-04-28 06:25:23 +03:00
PsiOmega
541fff5ad2
Crushing closets or mechas will now cause damage to the door.
2015-04-27 19:02:38 +02:00
Yoshax
aa115f5bb2
Fixes antag surgery kit
2015-04-27 16:41:47 +01:00
PsiOmega
d59ff1e1f9
Begins work to remove the need for spawn() in New() procs.
2015-04-27 08:23:54 +02:00
PsiOmega
a78c559f6c
Merge remote-tracking branch 'upstream/master' into dev
2015-04-27 08:08:39 +02:00
RavingManiac
89a72fb326
Candle burn time increased to ~30 minutes
...
Some fluff added to candle description explaining how they burn in space
2015-04-27 12:10:54 +10:00
Zuhayr
1c627a94b9
Merge pull request #8991 from Kelenius/ofBotsAndMobs
...
Updates bots to be mobs. Several changes.
2015-04-27 11:29:32 +09:30
PsiOmega
f6d79d121c
Now only secure airlocks buzz if access is restricted.
2015-04-26 22:05:39 +02:00
PsiOmega
d0397784c0
Mech sensors should not block airlocks.
2015-04-26 21:44:05 +02:00
PsiOmega
5c993e3a31
Removes the stop effect because I don't personally care one way or another.
2015-04-26 21:42:43 +02:00
PsiOmega
7f1ed80b74
Adds power draw.
2015-04-26 21:36:24 +02:00
mwerezak
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
PsiOmega
952cdda4e6
Merge remote-tracking branch 'upstream/dev' into PortableNanoUI
...
Conflicts:
baystation12.dme
2015-04-26 19:40:05 +02:00
PsiOmega
19a981e961
Airlocks can now crush more things.
...
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983 .
2015-04-26 19:29:13 +02:00
Chinsky
e0c00bda55
Merge pull request #8973 from mwerezak/inventory2
...
Inventory updates
2015-04-26 20:13:21 +03:00
Chinsky
5f30d0fa9a
Merge pull request #8982 from PsiOmegaDelta/Bullets
...
Adds practice rounds.
2015-04-26 20:06:37 +03:00
Chinsky
7359562e16
Merge pull request #8905 from PsiOmegaDelta/BorgModules
...
Silicon Subsystem update.
2015-04-26 20:06:21 +03:00
Chinsky
946373f8a0
Merge pull request #8975 from PsiOmegaDelta/Thunderdome
...
Custom ambiance music for holodeck programs.
2015-04-26 20:05:58 +03:00
