4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
2222445eb3
Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites
...
Adds 7 new AI core sprites and adds new pAI card sprites.
2015-05-12 21:01:30 +09:30
e9cc39039c
Merge pull request #8946 from Zuhayr/miningstuff
...
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
c8135cf87b
Merge pull request #9205 from mwerezak/masks
...
Snacks, drinks, and pills now check mouth coverage
2015-05-12 18:11:48 +09:30
b15ff78302
Merge pull request #9130 from mwerezak/device-powercell
...
Adjusts charge cost for energy type guns
2015-05-12 18:11:39 +09:30
a6ecdedf74
Fix for being forever tajaran
2015-05-12 07:48:54 +03:00
495783de59
As per Ginja's suggestion, dummies are now used one per prefs datum.
...
Slightly less metal but amount of stuff created/deleted in every human is just too huge.
2015-05-12 07:24:25 +03:00
3184f157e9
qdel
2015-05-12 13:12:58 +09:30
86c8c8c52b
Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart.
...
Also fixed a runtime, somehow head was created without a tajaran and got lost.
2015-05-12 06:42:08 +03:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
5c8ceae2fa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
2015-05-12 06:04:22 +03:00
29823e3552
Changed update_preview_icon to use a human dolly to get all those icons instead of... old way.
...
I guess it's more hacky, but fairly shorter and means you don't need to touch that... thing when you add a new job/change existing loadout.
Also changed preference transfer to use appearance procs to properly sync with organ colors.
2015-05-12 05:55:49 +03:00
b1bfbf346d
Snacks, drinks, and pills now check mouth coverage
...
Mouth coverage is defined somewhat conservatively so that breath masks
and the like do not prevent eating. In general only things that
completely cover your face or head like gasmasks and space suit helmets
block eating and drinking, or forcing the same on someone.
2015-05-11 22:17:24 -04:00
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
d14904e1d6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/response_team.dm
code/modules/hydroponics/spreading/spreading.dm
code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
6f41625752
Added construction drone sprites from Pawn.
2015-05-11 14:46:47 +09:30
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
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
6b57189076
Merge pull request #9171 from PsiOmegaDelta/DroneSplosion
...
Fixes #9169 .
2015-05-10 18:06:22 +03:00
6e003e6d99
Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime
...
Grabs no longer endless loop runtime.
2015-05-10 23:20:56 +09:30
fff5ea7840
Grabs no longer endless loop runtime.
2015-05-10 12:11:52 +02:00
929e64311e
Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
...
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
647298e550
Fixes #9169 .
...
Drones can now survive entering chargers and being picked up.
2015-05-10 10:52:56 +02:00
753d63439c
Removes the leading comma in software.dm.
2015-05-10 02:24:10 -05:00
34eb2872b6
Makes the code compile by adding a comma and removing some unused lines.
2015-05-10 02:03:28 -05:00
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
7e8a173fd4
Adds 7 new AI core sprites.
2015-05-09 18:02:30 -05:00
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
999b0ca99d
Compilation fixes.
2015-05-08 08:33:41 +02:00
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
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
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
d7e5792f98
Ensures dionaea nymphs respect antagHUD restrictions.
2015-05-07 13:28:35 +02:00
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
7cbd72d1be
Cleanup.
2015-05-07 09:09:12 +02:00
10edb06036
Do not copy-paste code.
...
Do not copy-paste code.
2015-05-07 08:43:24 +02:00
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
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
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
4602bd033f
Fixes #9106 .
...
Now only carbons can be given items, as intended.
2015-05-06 15:41:39 +02:00
2a96210223
Fixes this one at least.
2015-05-05 16:47:40 +02:00
b6b3548760
I'm too broken for this
...
Should work now.
2015-05-05 14:20:35 +02:00
f69358d4f5
Removes unneeded variable
...
Thanks Psi for pointing that out.
2015-05-05 14:12:03 +02:00
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
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
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
e0a903d9eb
Merge pull request #9093 from Baystation12/master
...
Master->Freeze
2015-05-05 01:42:57 +03:00
Zuhayr