Commit Graph

1509 Commits

Author SHA1 Message Date
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Emmett Gaines
1d201939ba [Ready] Shuttle dock() rewrite (#29049)
A complete rewrite of the dock proc for shuttles to make it more maintainable and readable and also bring over some new features while we're at it. This allows for multi-area shuttles and more control over the effects of anything being moved.

Areas, and movable atoms all have (before|on|after)ShuttleMove procs, turfs have (from|to)ShuttleMove procs which are called the same as beforeShuttleMove.

All ShuttleMove procs have been moved to a single file in the shuttle module.

Stationary docks will have their baseturf_type and area_type modified in maps once the problems have been worked out.
2017-07-17 12:17:56 +12:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
Jordan Brown
bf4373958e Merge pull request #29233 from optimumtact/bumped
Rename Bumped to CollidedWith
2017-07-15 11:29:41 -04:00
ShizCalev
db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
oranges
e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
oranges
5494f5328a Rename Bump to Collide (#29207)
This reduces confusion arising from the fact byond already has a built
in byond proc also named Bump.

We used an argument called yes to distinguish our Bump from byond's
builtin bump, but then we failed to make sure everyone of our bumps
properly override it, so a bunch of things have been double bumping

This resolves that issue permanently

I've also removed the second argument as it no longer has a purpose

I also cleaned up the recycler bump as it didn't do anything the
parent procs didn't already do
2017-07-14 13:47:22 +02:00
AnturK
d3bcb4cbf9 Removes old height parameter from CanPass proc (#29218) 2017-07-13 08:57:25 -03:00
kevinz000
7a26305498 Replaces ex_act and emp_act numbers with defines (#29215)
* defines

* defines

* explode_none
2017-07-13 08:56:26 -03:00
ShizCalev
c79aeb9cc0 Var cleanup (#29168) 2017-07-11 16:32:32 -03:00
Jordan Brown
d135dc2643 Merge pull request #29162 from ChangelingRain/directionliststweak
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs
2017-07-10 18:45:52 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Ashe Higgs
8776c15703 Supermatter code cleanup (#29103)
* Simple animals are now properly disintegrated

* Now it's a cleanup PR!

* sanity check me out

* praise the webeditor!
2017-07-09 20:59:48 -04:00
Jordan Brown
d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
Joan Lung
ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
ShizCalev
40aa9ce8ce Switches SM squawk to report integrity (#29084) 2017-07-09 11:14:05 -04:00
Joan Lung
24f69f814b missed these 2017-07-08 14:09:07 -04:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
Jordan Brown
54f46ca1a0 Merge pull request #29097 from KorPhaeron/lex
New portable generator icons
2017-07-07 23:28:00 -04:00
Jordan Brown
c9e1f2a42f Kor's a butt 2017-07-07 20:44:41 -04:00
Jordan Brown
4553bc8109 Merge pull request #29090 from ShizCalev/sm-alarm-sounds
Adds alarm sounds to SM
2017-07-07 13:18:04 -04:00
Jordan Brown
e74ba17b96 Merge pull request #29080 from ShizCalev/sm-attack-tweaks
Removed silicon SM interact message
2017-07-07 10:23:04 -04:00
KorPhaeron
c478796ee9 New portgen icons 2017-07-06 20:10:58 -04:00
shizcalev
44066d2258 Switch instead 2017-07-06 14:09:00 -04:00
shizcalev
9eafe2f28e changed playsound to src 2017-07-06 13:56:10 -04:00
shizcalev
1166b6ccc4 Adds alarm sounds to SM 2017-07-06 13:39:00 -04:00
shizcalev
12d70973f0 Correction 2017-07-06 12:12:04 -04:00
shizcalev
97830806bb Changes SM integrity rounding 2017-07-06 03:54:18 -04:00
shizcalev
74f1fa43e8 Removes silicon SM interact message 2017-07-06 02:14:55 -04:00
Ashe Higgs
044fa0ea45 Cleans up godclash code (#28939)
* Cleans up clash code, adds sound_to_playing_players

* Removes some debug code

* z-level check

* Removes an old thing

* Cyberboss changes

* changes @ maintainer request
2017-06-30 20:03:40 -04:00
oranges
ae3740d84b use_power var now uses a define to reflect it not being a bool
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE

holopads now correctly set use_power and the active_power_usage
2017-06-29 23:50:16 +00:00
Jordan Brown
503a20119b Merge pull request #28892 from nicbn/revert-28577-freezer_heater_fix
Revert "Freezers and heaters now drop the correct materials"
2017-06-29 00:54:24 -04:00
Shadowlight213
c9d2c2bd8d Ports bay's supermatter monitor modular program (#28635)
* WIP

* How the hell did these not get committed

* Fixes, icons for the tablet

* Laptops use the static engine overlay when running the program.
Engineering tablets now start preloaded with a supermatter monitor and alarm monitor.

* Defines

* Requested changes.
Engineering tablets no longer have preinstalled programs.
Supermatter status percents are defines

* Minor thing
2017-06-28 11:05:09 -04:00
nicbn
0f710f70c6 Revert "Freezers and heaters now drop the correct materials (Fixes #28560)" 2017-06-27 23:10:19 -03:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
AnturK
72638a14a2 Fixes SM getting energy when hit in space. 2017-06-20 15:46:27 +02:00
Jordan Brown
2328081b25 Merge pull request #28577 from Xhuis/freezer_heater_fix
Freezers and heaters now drop the correct materials (Fixes #28560)
2017-06-19 22:26:29 -04:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Xhuis
fd1c8861ed Fixes Freezer and Heater boards randomizing 2017-06-18 21:45:31 -04:00
bgobandit
5bc348c366 Adds traitor steal objective: the Supermatter Sliver. (Fixed) (#27913)
* Adds a new steal objective, the Supermatter Sliver.

* actually commits theft_tools honke

* i actually dk what this is

* fixes v1

* Supersmatter sliver requested changes

* you know what I fucking hate is unchecking shit

* please does this fix it fucking dme clown shit

* placates the cyberboss and the lziard

* fucking clownery

* I forgot to fucking check it

* Hope this fixes it

* will my children inherit this PR

* reeeeeeeeeeeeeeee

* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
ShizCalev
6bfe73cc57 Adjusted atmos device layers + added new pipe subtypes (#28466) 2017-06-16 17:25:02 -03:00
Ashe Higgs
88d3ef2fe8 Hand drill, jaws of life, and emitter grammar tweaks (#28493) 2017-06-16 17:18:56 -03:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
QualityVan
12e1a95535 Makes cable small again 2017-06-04 17:58:25 -04:00
kevinz000
ff98ec2a42 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#27905)
* Update supermatter.dm

* Update supermatter.dm

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2017-06-03 18:57:40 +02:00
the real drline
2a97453a8a Fix cable coil dupe and APC icon oddity (#27921)
* Fix APCs creating terminal on cut cable connection

* Fix missing icon state for empty APCs

* Make the wire panel inaccesable for empty APCs

* Make the ui inaccessable for empty APCs

* Redo this a different way so it performs correctly

* Update apc.dm
2017-06-02 21:10:56 +02:00
Expletive
2b298bb6aa Adds The NT-75 Electromagnetic Power Inducer (#27653) 2017-05-31 14:59:13 -03:00
kevinz000
29a1734b3c [READY]Replaces R&D accelerator laser with beam rifle, adds MouseMove and mouse parameter tracking to client, adds blast cannons! (#27618)
kevinz shitcode
2017-05-29 20:44:42 -05:00
AnturK
97850a89f4 Speeds up apc visual updates (#27797) 2017-05-29 11:13:28 -03:00
AnturK
0a2d1f1bf3 coil to initialize 2017-05-28 23:09:53 +02:00