Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Mloc
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
Mloc
e602a7e286
remove the sub-area system
...
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
Hubblenaut
fb8812d1b7
Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
...
fixup
2015-05-10 17:54:34 +02:00
Chinsky
6b57189076
Merge pull request #9171 from PsiOmegaDelta/DroneSplosion
...
Fixes #9169 .
2015-05-10 18:06:22 +03:00
Zuhayr
6e003e6d99
Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime
...
Grabs no longer endless loop runtime.
2015-05-10 23:20:56 +09:30
PsiOmega
fff5ea7840
Grabs no longer endless loop runtime.
2015-05-10 12:11:52 +02:00
Ccomp5950
929e64311e
Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
...
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
PsiOmega
647298e550
Fixes #9169 .
...
Drones can now survive entering chargers and being picked up.
2015-05-10 10:52:56 +02:00
MrSnapwalk
753d63439c
Removes the leading comma in software.dm.
2015-05-10 02:24:10 -05:00
MrSnapwalk
34eb2872b6
Makes the code compile by adding a comma and removing some unused lines.
2015-05-10 02:03:28 -05:00
MrSnapwalk
89aa07fdf9
Adds new pAI sprites by WalterJe, adds a few more emotions (neutral, silly, :^), smirk, exclamation points, and question mark). Adjusts Tudoreleuu's custom item sprite to fit the new screen sprites.
2015-05-10 00:40:13 -05:00
MrSnapwalk
7e8a173fd4
Adds 7 new AI core sprites.
2015-05-09 18:02:30 -05:00
PsiOmega
b98461c2af
Station alarm monitor changes.
...
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
2015-05-08 11:22:29 +02:00
PsiOmega
999b0ca99d
Compilation fixes.
2015-05-08 08:33:41 +02:00
PsiOmega
28d24fc8c6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/atmos_control.dm
code/game/machinery/telecomms/logbrowser.dm
code/modules/mob/mob_helpers.dm
2015-05-08 08:23:15 +02:00
Ccomp5950
a36acc8eba
Merge pull request #9136 from GinjaNinja32/CyborgIsNotAI
...
Fixes cyborgs showing up as AIs in radio output for AIs.
2015-05-07 23:23:54 -04:00
GinjaNinja32
cec16d7559
Fixes cyborgs showing up as AIs in radio output for AIs.
...
Also fixes pAIs and non-carbon non-robot non-AI non-pAI mobs doing the same.
2015-05-07 14:48:18 +01:00
PsiOmega
d7e5792f98
Ensures dionaea nymphs respect antagHUD restrictions.
2015-05-07 13:28:35 +02:00
PsiOmega
783e437c5e
Enforces antagHUD restrictions.
...
antagHUD checks were missing in a few places.
Can no longer join as drone, ERT member, or pAI if you have enabled antagHUD.
2015-05-07 09:55:26 +02:00
PsiOmega
7cbd72d1be
Cleanup.
2015-05-07 09:09:12 +02:00
PsiOmega
10edb06036
Do not copy-paste code.
...
Do not copy-paste code.
2015-05-07 08:43:24 +02:00
PsiOmega
9e4dacc765
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/machinery/machinery.dm
code/game/objects/items/weapons/storage/misc.dm
code/game/response_team.dm
html/changelogs/HarpyEagle-NeckgrabFix.yml
2015-05-07 08:14:57 +02:00
mwerezak
3e1e137cec
Adds device powercells
...
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
2015-05-06 23:41:57 -04:00
Chinsky
af7ec5c8ad
Merge pull request #9099 from StarSmasher44/patch-2
...
Adds Icon Caching for some Mob HUD Icons
2015-05-06 19:01:20 +03:00
PsiOmega
4602bd033f
Fixes #9106 .
...
Now only carbons can be given items, as intended.
2015-05-06 15:41:39 +02:00
Atlantiscze
024dabef7b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-05 22:13:58 +02:00
StarSmasher
2a96210223
Fixes this one at least.
2015-05-05 16:47:40 +02:00
StarSmasher
b6b3548760
I'm too broken for this
...
Should work now.
2015-05-05 14:20:35 +02:00
StarSmasher
f69358d4f5
Removes unneeded variable
...
Thanks Psi for pointing that out.
2015-05-05 14:12:03 +02:00
StarSmasher
b03d5a7850
Adds Icon Caching for some Mob HUD Icons
...
Adds partial caching for some of the smaller HUD additions of the mobs to allow for less processing needed to constantly update the icons when needed.
Code has been tested on a live server for several weeks prior to it's shutdown, so it should work as great as it has worked for us.
2015-05-05 14:04:53 +02:00
PsiOmega
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
PsiOmega
151c5204ee
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/modules/projectiles/gun.dm
html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
Chinsky
e0a903d9eb
Merge pull request #9093 from Baystation12/master
...
Master->Freeze
2015-05-05 01:42:57 +03:00
Kelenius
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
Ccomp5950
4a7d970bce
Merge pull request #9090 from Kelenius/ofLogsAndTypos
...
Fixes a few log-destroying lines
2015-05-04 15:30:13 -04:00
Kelenius
33dde892e2
Fixes a few log-destroying lines
2015-05-04 21:33:30 +03:00
PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +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
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
d5495870d1
Merge pull request #9045 from mwerezak/resist
...
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
mwerezak
3509178aa8
More resist refactoring
...
Reorganizes resist a bit more to allow for cleaner inheritance.
2015-05-01 15:13:07 -04:00
PsiOmega
b34e44ab84
Mice are now numbered.
...
You are not a man. This should also make things easier for admins.
2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e
Fixes #9044
...
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -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
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
Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
mwerezak
19aff88b90
Fixes #9017
2015-04-28 12:22:21 -04:00
Kelenius
948252d25b
Removes unused files added by accident, separates reagent files
2015-04-28 11:00:56 +03:00
