Commit Graph

1347 Commits

Author SHA1 Message Date
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
da437e50ee Merge pull request #3485 from Neerti/5/31/2017_make_surgery_slightly_better_again
Surgery Modifications
2017-06-01 14:42:38 -05:00
Anewbe
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05:00
Neerti
a0a390e887 Surgery Modifications
Semi-rewrites how surgery failure works.  Using an improper surface will call the surgery step's fail proc instead of just doing a melee attack.
Adds 'surgery odds' var to objs, which determines effectiveness.  The numbers for operating tables/roller beds/tables remain unchanged from the previous version, however doing it this way makes it cleaner to add new surfaces in the future.
Adds a proc to get a surgery surface.
Also makes burn repair on FBPs more efficent, so that one scorched robot does not take literally all of robotic's wires.
2017-05-31 17:41:02 -04: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
Leshana
b89897e8a2 Enhances power monitor computers to use the nano-map to show APC locations.
* In addition to showing APCs on a sensor'd powernet, the same APCs can be shown on the nano-ui map!
* Hover tooltip shows basic information on the APCs.
* Makes it easier to spacially understand where APCs are when you send people out to work on them.
2017-05-22 16:15:47 -04:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00
Leshana
694a0f9a6a Adds Ender Cable
* This cable type looks and acts like heavy duty cable, but magically connects to anywhere even across zlevels.
2017-05-04 18:50:41 -04:00
Arokha Sieyes
3fc249bf8b Tether 1,8 work
Adds solar farm to the left of z1
2017-05-04 17:48:21 -04:00
Arokha Sieyes
6d756f1f86 Eris APC Icons 2017-04-23 19:02:02 -04:00
Anewbe
04971fcbb4 Merge pull request #3346 from VOREStation/cable-directions
Port multi-z cable improvements from Baystation
2017-04-22 09:36:56 -05:00
Leshana
ba36df71a7 Replace color macros and stream operator with style and to_chat 2017-04-21 14:25:12 -04:00
comma
260ccffe48 Updates cable construction
FOrgot to update it to new direction whoops.
Also makes powernet connectino proc for cables multiz aware.
Port of: https://github.com/Baystation12/Baystation12/pull/15940
2017-04-21 14:25:11 -04:00
comma
c16fba6c8d Makes cable use BYOND directions
Instead of 11,12 they use 32,16 for DOWN,UP
Merges multiz handling into main logic
Port of: https://github.com/Baystation12/Baystation12/pull/15907
2017-04-21 14:25:11 -04:00
Leshana
30d2f16b04 Replace color macros and stream operator with style and to_chat 2017-04-21 11:22:08 -04:00
comma
f614de8387 Updates cable construction
FOrgot to update it to new direction whoops.
Also makes powernet connectino proc for cables multiz aware.
Port of: https://github.com/Baystation12/Baystation12/pull/15940
2017-04-21 11:22:07 -04:00
comma
5f2d23fbd7 Makes cable use BYOND directions
Instead of 11,12 they use 32,16 for DOWN,UP
Merges multiz handling into main logic
Port of: https://github.com/Baystation12/Baystation12/pull/15907
2017-04-21 11:22:07 -04:00
Arokha Sieyes
647350eedb Eris Computer Icon Tweaks 2017-04-19 23:53:53 -04:00
Arokha Sieyes
0fe43a1f2b Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:54:16 -04:00
Arokha Sieyes
49b31344f5 Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:51:03 -04:00
Leshana
45ebc1a16f Lights icons, sounds, and alert animations
* Ports Eris sprites for lights
* Plays a sound when lights turn on.
* Fire and atmos alerts now use flashing colored lights!
2017-04-18 23:20:09 -04:00
Arokha Sieyes
3947afd624 Shadeless lamp
Title.
2017-04-18 23:03:09 -04:00
Arokha Sieyes
e69f5bf981 Make cells show correct icon when they spawn
Initialize is great for cells sitting on a counter or something when the map loads. But not really for cells in guns that R&D prints and stuff. Kinda needs to be in New().
2017-04-02 19:28:11 -04:00
Arokha Sieyes
b7ed0aa156 Make cells show correct icon when they spawn
Initialize is great for cells sitting on a counter or something when the map loads. But not really for cells in guns that R&D prints and stuff. Kinda needs to be in New().
2017-04-02 19:21:45 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Yoshax
fb7da48588 Fixes an issue with smes deconstruction 2017-03-30 16:42:11 +01:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Leshana
3a4bc3d897 Fix signularity_pull leaving ghost item in your inventory slot
* It called u_equip()  Nothing should call u_equip(), bad!
* Also replaced magic numbers with defined constants while I was checking singularity code.
2017-03-20 21:31:52 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Leshana
356e96b421 Enhances power monitor computers to use the nano-map to show APC locations.
* In addition to showing APCs on a sensor'd powernet, the same APCs can be shown on the nano-ui map!
* Hover tooltip shows basic information on the APCs.
* Makes it easier to spacially understand where APCs are when you send people out to work on them.
2017-03-13 20:50:30 -04:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Neerti
0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe
bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06: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
Leshana
de85e27e25 Fix construction and deconstrution of PACMANs
* Modernized to use modern machine code instead of doing it itself.
* Made it compatible with modern circuits and machine frames.
* Also fixed some color macros to use CSS while I was there.
2017-02-22 10:32:27 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Anewbe
cad668a72a Further tweaks to Vox and their toys 2017-02-01 21:43:21 -06:00
Spades
0c3db41e89 Fixes lights for macros, hopefully. 2016-12-29 02:05:17 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
ForFoxSake
89d4e3b824 Fixes SMES power window from throwing runtimes while in construction. 2016-12-09 13:05:57 +00:00
Anewbe
8414d25ebc Merge pull request #2800 from Nerezza/APCwork
Misc APC tweaks & fixes
2016-11-24 14:21:33 -06:00
Anewbe
f521625646 Singulo should be more stable now, produce power earlier 2016-11-22 22:00:43 -06:00
Nerezza
d7104ef027 Misc APC fixes & tweaks
-Adds a Polaris version of APC rebooting
-Changes the random APC-bluescreening event to be more sensible in what it does and how to repair it. Bluescreened APCs are permanently unlocked, and can be fixed by removing the power cell and applying a multitool.
-EMP'd APCs now give Bay's timed (or manual) reboot nanoUI so that important places aren't shut off permanently if engineering can't get around to them. 
-Nins and twizs no longer **** up APCs when they drain power from the cell completely. Also, drained power comes from the powernet primarily, and only draws from the battery if the powernet doesn't give enough (random chance) or if the cable is cut.
-Bluescreened APC sprite now switches to an open wire panel sprite if a screwdriver is applied.
-Grid checks put a nanoUI notice on APCs. As it is now, you have to wait for the grid check to end or use the grid checker in engineering before you can manipulate APCs.
-Grammar fixes
-More grammar fixes
-My god the grammar fixes
-to_chat'd the user <<s again.
-Merged a small clean-up to power states.
-Bashing APCs to pieces was always ineffective but would spam everyone anyway. Now, it only spams the person bashing the APC. This is a placeholder, ideally you should be able to bash a working APC's cover off if you want its battery out but this PR is already big enough as is.
2016-11-21 20:04:58 -06:00
Nerezza
c25c2d9f1f Some work on making APCs better
Grammar fixes, more grammar fixes, a couple bug fixes, a few more grammer fixes.

Oh I also went ahead and to_chatted them user <<s again.
2016-11-20 03:24:47 -06:00
Anewbe
0418911e0b Robots should not be shocked by wires/machines 2016-11-12 21:35:55 -06:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
Neerti
bb489cb09f Adds the new Grid Check event to rotation.
Maps in a new Grid Checker machine, located in an expanded substation room in Engineering.  When a grid check happens, Engineering can hack that machine to restore power sooner.  Wearing insulated gloves is highly recommended.
2016-10-21 12:47:57 -04:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00