Commit Graph

110 Commits

Author SHA1 Message Date
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
PsiOmega
3d03842f8a Adds missing closing quote. 2015-08-10 18:10:53 +02:00
PsiOmega
570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
2015-08-10 17:56:14 +02:00
PsiOmega
fb6ab23189 Makes the new initialization message use the proper method. 2015-08-10 17:46:38 +02:00
PsiOmega
a710e77d46 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
2015-08-10 17:42:40 +02:00
mwerezak
12549b7e93 Fixes area power initialization
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
2015-08-09 19:58:37 -04: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
729a7a3ec9 Gamestart cleanup.
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
2015-05-16 10:59:45 +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
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +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
eca7569077 Clean server start.
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
2015-04-18 15:32:25 +02:00
Zuhayr
3718245e45 Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation. 2015-03-21 11:13:53 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega
fac4eb08e3 Alarm subsystem is now processed by the scheduler. Removes now dead code. 2015-03-13 10:36:47 +01:00
Graham Lloyd
160183ebd5 finishes work on adapting the goon process scheduler for BS12. 2015-03-04 05:14:36 -05:00
PsiOmega
ec4b8c78a1 Merge remote-tracking branch 'upstream/dev' into subsystems
Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm
2015-02-17 08:36:12 +01:00
PsiOmega
2e9c266a2f Basic main structure for centralized alarm handling. 2015-02-17 08:34:26 +01:00
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
mwerezak
b7e3a14e0d Fixes machines being usable after a power failure
Fixes machines not gaining the NOPOWER flag after a power failure
because they were turned off and had use_power set to 0.
Fixes machines not gaining the NOPOWER flag after being moved into an
area with no power.

Both bugs allowed power using machines to be used in areas with no
power.
2015-02-11 23:28:53 -05:00
Zuhayr
7ed0e26b59 Readded asteroid secret placement, adjusted some values. 2015-01-23 13:40:10 +10:30
Zuhayr
5c37b9e58c Committing some maze fixes and trying to reproduce a weird DD bug. 2015-01-23 13:40:06 +10:30
Zuhayr
cd494cdef1 Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf. 2015-01-23 13:40:05 +10:30
Zuhayr
07793edc85 Converted mining map over to this new system. Currently broken. 2015-01-23 13:40:03 +10:30
Wild Bill
5bae906c47 Reserve PascalCase inits 2014-12-16 16:20:50 +02:00
PsiOmega
0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
PsiOmega
955b64e0a5 Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names. 2014-11-03 12:51:01 +01:00
PsiOmega
ff14da90b3 Random Event Overhaul
Alters the event controller based on http://baystation12.net/forums/viewtopic.php?f=5&t=10706.
Exception is that there is always some start time variance to prevent metagaming.

Mundane, moderate, and major events run on their own timers and start and run independantly of each other.
Multiple events of the same severity degree can run at the same time. However, currently only one instance of the same event can be active at a time.
2014-11-03 09:22:37 +01:00
GinjaNinja32
df29429e0e Add dd_insertObjectList proc, adjust obj/machinery/New to use this proc 2014-10-30 22:59:10 +00:00
PsiOmega
a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
PsiOmega
1cabbbf5a6 Master controller no longer annihilate powernets, powernets annihilate themselves.
Some misc. changes.
2014-10-15 09:44:15 +02:00
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
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
431a7474ea Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:17 +10:30
Mloc
056fbd79d1 fixes #6599
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-06 09:57:01 +01:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
mwerezak
d12a09addb Powernets
Moved powernet datum definition to powernet.dm
Improved APC load balancing.
Updated SMES charging to work better with new APC/powernet code.
2014-09-07 01:10:22 -04:00
mwerezak
e045c84f97 Fixes APC load totals periodically doubling
Also fixes areas updating excessively when update_use_power() was
called.
2014-09-06 11:35:58 -04:00
PsiOmega
1084a1d6d7 Optimization of machinery sort? 2014-08-24 22:52:51 +02:00
Zuhayr
649af28c77 Fixed the overlay issue for now. This will need replacing. 2014-08-13 12:04:51 +09:30
mwerezak
e1dc7d436b Fixes icons and other things not updating when the master controller updates power status.
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
bf0a17dcb0 Fixes NOPOWER not updating when machines are moved 2014-07-28 18:52:13 -04:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
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
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
Zuhayr
5ace6d3bc0 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs. 2014-07-09 19:12:32 +09:30
Zuhayr
19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
mwerezak
abcba2c725 Merge remote-tracking branch 'upstream/dev' into emergency-shuttle 2014-06-24 17:49:20 -04:00