Commit Graph

408 Commits

Author SHA1 Message Date
Cyantime
02dc0d8dba Was too low 2017-07-31 07:58:29 -04:00
Cyantime
39917bf01a Meteors Now 2017-07-29 20:37:06 -04:00
killer653
317b9e18e3 Fixes Ion storm from blocking all PDA messages 2017-07-28 06:57:49 -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
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
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -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
Leshana
9d2e7fe1ae Prevent Gravity Failure event from disabling gravity on planet z levels. 2017-05-24 17:14:03 -04:00
Leshana
ae270c6938 Adjusts random events to be more suitable for the Tether
Fixes #1542  Fixes #1396
* Disables the Supply Demand event until it can be reworked to be more interesting.
* Removes volatile fuel from the possible gases leaked in Atmos Leak event.
* Excludes areas around spawn points from the Atmos Leak event.
* Prevents gravity failure from disabling gravity on planetary z levels.
2017-05-24 17:08:39 -04:00
Yoshax
e5ebd3a56d Fixes a radiation oversight 2017-05-22 16:33:37 +01:00
Yoshax
40ba4f5913 Fixes a radiation oversight as per Bay 2017-05-22 16:29:04 +01:00
Yoshax
660d6d0ebe Tweaks readstorms as per Bay 2017-05-22 16:26:24 +01:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00
Arokha Sieyes
055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Anewbe
fd9b3acaef Fixes the carp lag issue 2017-04-13 14:11:10 -05:00
Cameron653
d9b923c450 Disables Ian storms
They happened every single shift for some reason. This just flat out disables ian storms.
2017-03-26 23:45:56 -04:00
Leshana
b2a8f5b3b3 Tweak events to reduce frequency of Ian storms and such. 2017-03-25 00:07:56 -04:00
Leshana
f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Arokha Sieyes
88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Arokha Sieyes
ebfa18aeea Fixed stupid rogue lines 2017-03-20 02:18:27 -04:00
Arokha Sieyes
a7b1e3f03b Cleaned up comments 2017-03-20 02:17:45 -04:00
Poojawa
557579fca1 Adds feedback to vendor uprising 2017-03-20 00:49:11 -05:00
Anewbe
59a4f62668 Merge pull request #3078 from Leshana/vplk-atmos-leak
New Event: Atmos Leak
2017-03-19 20:22:42 -05:00
Arokha Sieyes
975cabc128 Merge pull request #1194 from VOREStation/appendicitis-vr
Adds a version of spontaneous appendicitis event that avoids people in dorms.
2017-03-17 18:03:30 -04:00
Leshana
42ed71ec2e In fact lets make most of the events one-shot! Otherwise it gets repeatative. 2017-03-17 01:03:34 -04:00
Leshana
f2033dda13 Adjustments to Supply Demand event.
* Adjusted to scale better with difficulty and be not quite so extreme.   Most categories will now be:
  * Mundane:  1-2 items
  * Moderate: 2-4 items
  * Major: 3-6 items
* Clarified that not everything has to go in crates.
* Vary flavor text for different severities.
2017-03-16 18:25:01 -04:00
Leshana
393fa31b4a Add leak events and djust weighting of Supply Demand.
* Supply demand was firing waaay too often.  Changed it to be a one shot event at each level, so it will at most happen three times per shift.
* Added atmos leak and canister leak events to rotation.
2017-03-16 17:21:02 -04:00
Leshana
31fbf85973 Adds a version of spontaneous appendicitis event that avoids people in dorms. 2017-03-16 00:26:14 -04:00
Leshana
eb65ff2ed2 Ports the new parts of https://github.com/Baystation12/Baystation12/pull/15298 back to Polaris
* Changes navbeacons to no longer use radios (Doing so was slower and didn't really help anything) Note: var/freq remains for mapping compatibility until all maps are updated.
  * Fixes navbeacons to actually hide under flooring if you put plating over them.
  * Changed how navbeacons are mapped in.  Don't use the picky "code_txt" variable, instead use appropriate subtype.
  * Made useful reusable subtypes so you don't have to code in a type for every. single. one.
* Updated mulebot to use new navbeacon codes.
* Re-activate patrolling!  With the new navbeacons, bots with will_patrol can follow the patrol navbeacons.
  * Note: various "should_patrol" variables on each bot type unified under /mob/living/bot/var/will_patrol
* Securitrons (beepsky) got an overhaul to the new patrol routing.
  * Note: BayStation replaced the snowflake handcuffs code with acutal handcuffs.  Polaris handcuffs requiere a grab to work, so are more complicated.  Kept our existing attack code.
  * Behavior procs reorganized to use better movement detection and just be more flexible.
* Floorbot fixes & removal of bridgemode
  * Floorbot will now remove & replace broken floor tiles.
  * Floorbot will no longer decide its okay to pave over all of SPACE.
  * For the moment patching hull breaches is disabled, it is too laggy.
* Sundry bugfixes to all bots
  * Use forceMove() instead of setting loc
  * Use "\The [X]" message strings.
  * Pass target to do_after() when doing something to a target.
* Fixed events that were supposed to emag bots to now do so again.
2017-03-14 16:29:29 -04:00
Arokha Sieyes
6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
Leshana
d8099edc4c Make sure that the canisters selected have a bit o' air in them. 2017-03-11 19:02:24 -05:00
Leshana
889e9403f0 New Event: Atmos Leak
In this event some sort of gas leak occours! A random area on the station is chosen to experience a leak of a randomly chosen gas!
* By default, areas with any people in them are protected, so it won't just kill someone.
* A warning announcement is given shortly before, so there is some warning.
* Dorms, Shuttles, Holodeck and Supermatter are protected.
* At higher severity, adds worse gasses and possibility of high/low temperature.
2017-03-11 01:07:22 -05:00
Arokha Sieyes
ac97cbf081 Merge pull request #1150 from VOREStation/vplk-atmos-leak
New Event: Atmos Leak
2017-03-09 23:27:19 -05:00
Leshana
a50d3c1a88 New Event: Atmos Leak
In this event some sort of gas leak occours! A random area on the station is chosen to experience a leak of a randomly chosen gas!
* By default, areas with any people in them are protected, so it won't just kill someone.
* A warning announcement is given shortly before, so there is some warning.
* Dorms, Shuttles, Holodeck and Supermatter are protected.
* At higher severity, adds worse gasses and possibility of high/low temperature.
2017-03-09 22:04:43 -05:00
Leshana
532864cab0 New Event: Canister Leak
Somewhere on the station, a gas canister is faulty and ruptures, releasing its contents (no explosion).
* Added as an event_manger event.  This version is nice on low severity and picks a canister with nobody nearby.
* Also added as a gamemaster event.
* Added helper method to check area occupancy.
2017-03-09 20:05:25 -05:00
Leshana
672360c48b New Event: Canister Leak
Somewhere on the station, a gas canister is faulty and ruptures, releasing its contents (no explosion).
* Added as an event_manger event.  This version is nice on low severity and picks a canister with nobody nearby.
* Also added as a gamemaster event.
* Added helper method to check area occupancy.
2017-03-09 19:59:32 -05:00
Leshana
602c0dc4e6 Enable VOREStation custom event rotation setup.
* Adds a new file which overrides the Polaris event rotation with our own datums.
* Disables a bunch of events so we can turn on auto-starting of the remaining ones.
2017-03-08 21:48:34 -05:00
Leshana
b0a6dfd58a Supply Demand event cleanup
* Improved the ending messages to be more fluffy and descriptive.
* Scaling bonus cargo points if win.
* Bugfixes for ending conditions and removing extra debugging systems.
* Move comments because indentation awk script gets confused.
2017-03-08 13:34:11 -05:00
Leshana
b289360eb7 Upgrade Supply Demand event to take department activity into account. 2017-03-07 18:40:45 -05:00
Leshana
fbe46b7df4 Added Supply Demand Event
* Yes, its an event where CentCom asks you to actually do something useful and make stuff.  You put it on the shuttle to win.
* It has something for most departments.  So far there are seven categories of items it requests:
 * Researched items (From protolathe etc)
 * Food Items
 * Chemistry Reagents
 * Drinks
 * Metals
 * Gas Mixtures
 * Mecha
2017-03-07 18:40:45 -05:00
Arokha Sieyes
a3e5e7327f Initial commit of new map system for Virgo 2017-03-02 23:34:43 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -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
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
4521a6a2c0 Merge pull request #2922 from Anewbe/crate_event
Ports Bay's Shipping Error event
2017-01-15 18:17:02 -05:00
Anewbe
4b9258afbf Ports Bay's Shipping Error event 2017-01-14 18:34:34 -06:00
Anewbe
aa91f86845 Space carp have a chance to stick around after their events 2017-01-14 00:34:15 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00