Commit Graph

9974 Commits

Author SHA1 Message Date
Mloc
733c6a4fb5 simulated var for atoms, used to filter explosions and other actions
kind of a stronger anchored var, used by lighting overlays

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:30 +01:00
Mloc
895e78df1e more lightweight camera caching
no loops

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:30 +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
PsiOmega
9d883ea914 Corrects implanter attack log.
The contents of the implant was reported in the attacker/victim log but not the admin log.
2015-05-10 15:11:37 +02:00
Ccomp5950
929e64311e Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
PsiOmega
5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
2015-05-10 10:43:46 +02: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
Yoshax
8f9fd29c5f Removes sleeping chems from clones and adds a consistent sleep period (+1 squashed commits)
Squashed commits:

[2c002f9] Removes sleepy chems from cloning
2015-05-09 20:08:19 +01: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
Ccomp5950
7e120053ed Merge pull request #9137 from GinjaNinja32/tcomms
Fixes... things. Lots of things.
2015-05-07 23:16:02 -04:00
GinjaNinja32
2e2cb07ba7 Fixes... things. Lots of things. 2015-05-07 15:32:16 +01: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
d6429afcba Cultists can no longer manifest ghosts with antagHUD enabled. 2015-05-07 10:35:25 +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
2eb35c6de8 Relocates the new ERT id-card creation code to its appropriate location. 2015-05-07 08:44:54 +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
Zuhayr
7389ec379f Merge pull request #9112 from PsiOmegaDelta/SenseMe
Adds stretches of power cable around the construction outpost.
2015-05-07 09:30:17 +09:00
Ccomp5950
143bde9774 Merge pull request #9111 from PsiOmegaDelta/AreaContentsConcat
Cloning vats and DNA scanners are again located by cloning computers.
2015-05-06 17:31:19 -04:00
StarSmasher
89e37938ca Optimizes invalidateCameraCache()
Before optimization it used 20.155 Total CPU/Self CPU on 183 calls
After optimization it used 0.443 Total CPU/Self CPU on 223 calls.
2015-05-06 17:41:32 +02:00
Chinsky
d1b4289b74 Merge pull request #9118 from PsiOmegaDelta/HaltSecurity
Fixes #9065.
2015-05-06 17:25:11 +03:00
Chinsky
16e417092a Merge pull request #9116 from PsiOmegaDelta/DoNotSeeMe
Fixes #9107.
2015-05-06 17:25:03 +03:00
PsiOmega
4af458ef6c Fixes #9065.
Central Command ids now at least makes security equipment respect you.
2015-05-06 15:23:44 +02:00
PsiOmega
5eeec376b2 Fixes #9083.
Computers are now only affected by brute and burn damage.
2015-05-06 15:12:14 +02:00
PsiOmega
767c6a151b Fixes #9107.
The empty donut box no longer uses a non-existing item state.
2015-05-06 15:06:19 +02:00
PsiOmega
e9b32cf26e Ensures drained_this_tick is actually set. 2015-05-06 12:30:05 +02:00
PsiOmega
72ffea6fd3 Attempts to ensure the powersink remains processed correctly, moves processing disconnection into Destroy(). 2015-05-06 12:25:50 +02:00
PsiOmega
78a9a43de6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/controllers/master_controller.dm
	code/game/objects/items/devices/powersink.dm
2015-05-06 12:19:50 +02:00
PsiOmega
83d1b9ad22 Adds stretches of power cable around the construction outpost, ensuring one does not have to climb over machines to being laying cables. 2015-05-06 11:25:04 +02:00
PsiOmega
b349e76604 Cloning vats and DNA scanners are again located by cloning computers. 2015-05-06 09:27:11 +02:00
Zuhayr
df6ff69f01 Merge pull request #9103 from DeeUnderscore/fix-fabricators
Fix mech fabricators not syncing
2015-05-06 11:04:21 +09:00
Atlantiscze
c34b8850a6 Fix
- Malfunction gamemode should now be startable. Probably not the nicest way to do it, but since the antag system is not documented at all i have no idea how to do it in nicer way.
2015-05-06 01:31:13 +02:00
Atlantiscze
024dabef7b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-05 22:13:58 +02:00
Atlantis
5201b88f60 Minor fix
- Malf AI spawning now works, currently only via TraitorPanel, the gamemode itself is still broken.
2015-05-05 21:36:02 +02:00
Atlantiscze
91e3ced65e Powersink Fix
- Fixes powersinks lasting for infinite duration before exploding.
- Minor adjustment to powersink drain rates. Powersink now drains up to 1.5MW instead of  1MW. It also attempts to drain up to 5kW instead of 2kW from each APC, unless powernet supplies enough power. They can still be overpowered by pumping more than 1.5MW into the grid, which is possible if you either install more coils into main SMES, or use the solars. Even 1MW of default SMES is enough to slow the drain effect considerably, espicially if you can isolate it with breakers.
- Fixes "APC Flickering" issues caused by powersinks. Powersinks are now processed immediately after powernets, which ensures they are first to take power from that powernet. This is unfortunately necessary as APCs would take power first, which is not desired.
- Minor refactor while i was at it - absolute paths, span classes, visible_message() instead of for cycle. No gameplay effect.
2015-05-05 18:49:11 +02:00
Daranz
82b7af7fb5 Fix mech fabricators not syncing
Fixes #9058.
2015-05-05 11:42:05 -04: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
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
Chinsky
8294f02c1b Merge pull request #9072 from PsiOmegaDelta/BrokenGrills
Grilles and rod tweaks.
2015-05-04 21:25:24 +03:00
Chinsky
3f03fea06e Merge pull request #9074 from RavingManiac/dev-2
Explosion tweaks and fixes
2015-05-04 21:25:12 +03:00