Commit Graph

83 Commits

Author SHA1 Message Date
silveryferret 7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Cameron653 e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Leshana 34c73dab69 Optimization/Rewrite of Radiation Controller
* The performance of the radiation controller as-is was not fast enough for inclusion in production servers, but it has some nice featuers, so rewrote it to be more performant.
* Instead of storing the radiation strength for every turf, we only store the sources of radiation, and calculate the strength only for mobs who might be in range.
   * Old method was ray-tracing to every turf in range whether anything was there to be irradiated or not.  Could be hundreds of turfs.  New method only lazily calcualtes strength at a turf if we actually need to know it.   Often times this is zero turfs if nobody is standing in engineering.
  * Removed the automatic processing of objects with "rad_power" set.  Objects are responsible for calling the repository to create/update their radiation sources.   Saves some extra overhead that in practice was redundant with other process controllers.
  * Also tweaked to be more respectful of qdel'd objects and added some comments.
2017-05-25 18:43:56 -04:00
Yoshax 4dd0bb9bbe Fixes SM stuff 2017-05-22 16:46:25 +01:00
Ben Reeve 6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00
Anewbe ed66150523 Tweaks hallucinations from the supermatter 2017-04-17 12:19:35 -05:00
Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Anewbe 83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Datraen 7f12558ff3 Supermatter now uses the global announcer.
Global announcer now has access to the engineering channel.
2016-11-19 01:08:46 +00:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
ccomp5950 44e3f28080 Hallucinations no longer burn on the SuperMatter 2016-02-05 22:49:28 +00:00
mwerezak 77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
Zuhayr 9a7515af8f Merge with dev-freeze. 2015-07-02 19:04:01 +09:30
Zuhayr 2a32150658 Merge pull request #9992 from Baystation12/master
Master into dev-freeze
2015-07-02 19:00:00 +09:30
mwerezak 5ec5fdeb46 Fixes #9591
Adjusts supermatter radiation range and intensity
2015-07-01 01:18:14 -04:00
Chinsky 94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
PsiOmega fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
2015-06-07 10:51:41 +02:00
PsiOmega fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
2015-06-07 10:30:27 +02:00
GinjaNinja32 fb1904ef4e Fixes a pair of null.z runtimes
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
2015-06-06 02:23:06 +01:00
PsiOmegaDelta 079b0af6b0 Adds spinning animation for meteors. 2015-06-05 15:55:39 +02:00
Zuhayr 5ea78421ff Merge pull request #9408 from mwerezak/sm-eject
Limits the ability of the SM to return to the station zlevel once ejected
2015-05-28 11:35:39 +09:30
Zuhayr f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general.
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
2015-05-25 14:49:57 +09:30
mwerezak 3c67c46442 Limits the ability of the SM to return to the station zlevel once ejected.
Fixes #7900
2015-05-21 01:02:30 -04:00
Atlantis 4149fead4e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanocrusade-two 2015-05-19 17:39:43 +02:00
Mloc 16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01:00
Atlantiscze 134eee0c6c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanocrusade-two 2015-04-30 23:42:38 +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
Ravensdale a1dbfb69c1 Changes SM alerts to Engineering frequency 2015-04-16 07:01:11 -07: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
Atlantis b3d39fa778 Supermatter v1 2015-04-12 14:51:12 +02:00
RavingManiac 50d0fd0bc6 Changed supermatter engine manual for thermoelectric engine.
Expanded supermatter engine radiator bank. Incinerator disposals outlet moved slightly to prevent collision. Supermatter radiator circulator pump changed to a high-powered pump.

Supermatter critical temperature lowered to 5000K.
2015-02-15 22:16:36 +08:00
RavingManiac b14e76f4a0 Fixed compilation error. 2015-02-13 00:56:01 +08:00
RavingManiac 98dd5c46c0 Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines.
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.

Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.

TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
2015-02-13 00:38:23 +08:00
Amunak 5a8a9c2816 Supermatter warning now has its own proc. Fixed some SM bugs.
Added logging for when SM explodes. The delay of regular warning was made *higher* (from 15 to 20 seconds) because of a bug; Delay of the emergency warning was lowered (from 30 to approx. 12 seconds). The announcement of 'returning to safe levels' now happens only once. The  spawn .. explosion and irradiation and hallucinations are now also applied only once (which means they may need some tweaking, but I have no idea if they stacked anyway; mainly the code should now be much more efficient).
2014-11-30 00:23:55 +01:00
Amunak 45b314bd60 Moved shard to the bottom of the file, tweaked its values.
Also added the time between delamination and actual explosion (pull time) as a separate val and lowered it for the shard.
2014-11-30 00:16:54 +01:00
Amunak 889442ef93 Supermatter code formatting 2014-11-30 00:07:54 +01:00
Amunak cc576db683 Fixed compile error because I don't know how istype() works 2014-11-29 20:33:37 +01:00
Amunak 309cf59f71 Supermatter shards now don't announce anything 2014-11-29 19:59:06 +01:00
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Atlantiscze 1e946c4153 Adds two mwerezak's requests. 2014-09-18 19:23:00 +02:00
Atlantiscze d64d9dd564 Supermatter Tweak
- O2 Primary mode now actually works.
- O2 has to be at least 15% (instead of previous 400%, WTF?) of core composition to actually have any effect on the core, considering all remaining gas is N2 (so realistically it's somewhere around 13-14%)
2014-09-18 00:08:59 +02:00
mwerezak 90af78ac44 Increases SM power output
Should safely run to 700 kW. Returned starting SMES charge back to
original value to compensate. Engine omnifilters now start off on round
start.
2014-09-12 23:01:15 -04:00
mwerezak 8f98b35c9a Reduces supermatter DAMAGE_RATE_LIMIT 2014-09-10 22:13:31 -04:00
mwerezak e513041768 Renames syndicate mothership area, fixes temp_factor calc 2014-09-08 22:38:52 -04:00
mwerezak 0b11295c8e Supermatter balance
Attempts to rebalance SM to work with new atmos machinery. Testing with
a 2-freezer 2-canister default setup, the engine can run to 500 kW at
700 K.
2014-09-07 01:19:16 -04:00
mwerezak ce970eacd2 Adds atmos/supermatter debug messages 2014-09-06 15:36:35 -04:00
mwerezak bad772d9c5 Adjusts the supermatter reaction parameters 2014-08-23 12:35:12 -04:00