Commit Graph

232 Commits

Author SHA1 Message Date
PsiOmegaDelta b5a47fd43b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
2015-07-01 22:46:40 +02:00
Zuhayr 8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
PsiOmegaDelta cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmegaDelta bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
2015-06-05 14:59:52 +02:00
PsiOmegaDelta a07d20d657 Ports /tg/'s meteor implementation.
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02: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
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
PsiOmega bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
PsiOmega bcb1ea5413 Endgame tweaks.
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
2015-05-26 12:29:50 +02:00
Zuhayr e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
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 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
Zuhayr 79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
PsiOmega e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega 858b56a2e5 The Nar-Sie summoning ritual is now animated. 2015-04-17 08:04:59 +02:00
PsiOmega 1daf0abe3d Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds. 2015-04-16 14:23:19 +02:00
PsiOmega d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega 1511e2b3f4 Ports /vg/'s Nas-Sie remake.
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
PsiOmega 990530d118 Ports /vg/'s spell system for the sake of cult porting.
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
Zuhayr d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr 98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Loganbacca 11d340f898 Projectile effects - Part 3
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
2015-03-09 22:17:34 +13:00
PsiOmega 93b049e7a6 Alarm centralization completion
Ensures the master area is always used, to avoid issues caused by dynamic lightning which splits areas into sub-areas.
Power alarms now handled centrally.
2015-02-23 11:23:23 +01:00
Ravensdale 2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
Chinsky 6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Atlantiscze 3e1ad4099e Wireless Wires Bug Removal
- This removes the dreaded wireless wires bug, which caused wires disconnected by explosions to actually still conduct power until powernet was manually updated.
- This also adresses issue with (on bay unused) singularity, which exhibits similar behavior when eating wires (wireless wires bug)
2015-01-01 17:20:21 +01:00
Amunak edffbc680d Fixed capitalization of most game items 2014-12-18 03:10:36 +01:00
Mloc-Argent 117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmegaDelta fae43793a4 Merge pull request #7142 from PsiOmegaDelta/Singularity
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
PsiOmega d6c0ebf138 Syndicate beacon power consumption and objective.
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
PsiOmega bf24d288ea Particle acceleration wiring. 2014-11-24 10:12:57 +01:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
PsiOmega 3a7066c6c1 Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error. 2014-10-20 19:18:27 +02:00
PsiOmega a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase.
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
Zuhayr 9b23315359 Fixes #6644 2014-10-11 07:44:48 +10:30
mwerezak 54d11506d0 Allows power to be read by examining the collectors 2014-08-25 20:57:32 -04:00
mwerezak 9fea39dea2 Quick fix for engine core flow imbalance
A more thorough fix should probably involve providing a way for players
to control the flow rate.

Also tweaks emitters and allows collectors to be read using a multitool.
2014-08-25 20:37:07 -04:00
mwerezak bad772d9c5 Adjusts the supermatter reaction parameters 2014-08-23 12:35:12 -04:00
mwerezak 025838532a Adjusts SM charging and output 2014-08-22 21:43:03 -04:00
mwerezak 4b070a2de6 Fixes #5935
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
mwerezak 213b11601e Updates emitters and containment field power usage
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
2014-08-10 00:40:58 -04:00
Mloc-Argent d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
PsiOmega 0bb878d198 Makes it possible to activate emitters using control buttons. 2014-07-15 21:16:27 +02:00
mwerezak dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
Zuhayr 9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Ravensdale 68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale 1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00