Commit Graph

24527 Commits

Author SHA1 Message Date
Aronai Sieyes
d35cb8c184 Merge pull request #7417 from VOREStation/aro-proteanpanel
Flip proteans back to protean panel on blob
2020-04-24 21:09:47 -04:00
Aronai Sieyes
f2314c32bb Merge pull request #7405 from VOREStation/vplk-static-machinery-power
Static Machinery Power
2020-04-24 21:06:52 -04:00
Natje0
c488039c32 Adds the Healrod, atm just a resprite (#7359)
* On-back healrod

* Left hand

* Right hand

* Gun icon

* Adds the Healrod (unfinished code)

All credits to zapzapper

* Fixes wrong directional sprite

* Makes healrod just a retextured ML3M... for now.

* Update code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm

Co-Authored-By: Aronai Sieyes <arokha@arokha.com>

Co-authored-by: Natje0 <Natje0@users.noreply.github.com>
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2020-04-24 21:06:39 -04:00
ShadowLarkens
6d59dbdfef Fixed multilingualism breaking ' and " in chat, and prevent html
injection
2020-04-24 16:10:31 -07:00
Aronai Sieyes
45f63c9cea Flip proteans back to protean panel on blob 2020-04-24 16:31:40 -04:00
Shadow Quill
8f5a20d29c Nightstalker Tail~ 2020-04-24 05:41:58 -05:00
Novacat
2c4a0a5831 Merge pull request #7350 from VOREStation/upstream-merge-6998
[MIRROR] Adds empty filter classes to send messages to particular vchat filters.
2020-04-23 23:56:38 -04:00
Novacat
a9d049f8c2 Update topic.dm 2020-04-23 23:17:11 -04:00
Novacat
3e83916244 Update admin_verbs.dm 2020-04-23 23:11:04 -04:00
Novacat
3ba0aec162 Update admin_verb_lists.dm 2020-04-23 23:10:32 -04:00
Novacat
c1a5a07208 Update callproc.dm 2020-04-23 23:02:32 -04:00
Novacat
de5b875043 Merge pull request #7351 from VOREStation/upstream-merge-6956
[MIRROR] Saycode Overhaul -- Multilingualism
2020-04-23 22:48:51 -04:00
ShadowLarkens
1d655268a4 Fixed merge conflicts and errors, everything seems to work 2020-04-23 18:25:25 -07:00
Leshana
763753648b Implements "static" area machinery power usage
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
2020-04-23 19:04:34 -04:00
Aronai Sieyes
290cc1fdf3 Merge pull request #7401 from VOREStation/aro-rcdind
Port /tg/ RCDs, Inducers
2020-04-23 17:47:29 -04:00
Aronai Sieyes
df0dc34311 Merge pull request #7396 from Holdelta/Dogborg-animations-+-Service-Hounds-ported-from-CitadelRP
Porting over Service Hounds and k92 animations and other missing details.
2020-04-23 17:47:13 -04:00
Aronai Sieyes
f16560de64 Merge pull request #7395 from VOREStation/vplk-update-power-usage
More machinery power update_var() proc usage
2020-04-23 17:46:55 -04:00
Aronai Sieyes
fb23e6f64f Merge pull request #7384 from VOREStation/vplk-vv-jump-to
VV Jump/Move To Coordinate
2020-04-23 17:46:36 -04:00
Aronai Sieyes
be6f4e0da0 Add inducer designs, make protolathe take titanium 2020-04-23 15:57:33 -04:00
Holdelta
a60e3917ba Porting over Service Hounds and k92 animations 2020-04-22 17:51:40 -07:00
Leshana
f80c320c0f VS machinery power update procs. 2020-04-22 20:47:16 -04:00
Leshana
9bd2347966 Fix remaining code that directly modified use_power to call update_use_power. 2020-04-22 20:47:15 -04:00
Leshana
93fb3f7865 Call update procs instead of directly setting idle_power_usage or active_power_usage.
- Adds the update_idle_power_usage() and update_active_power_usage() procs for the respective vars.
- Switches all places modifying those vars directly to call the procs instead.
- This will let us react to the change appropriately, paving the way towards static area power.
- Adds update_power_channel proc for the sake of completeness, but no machines actually modify it so far.
2020-04-22 20:47:15 -04:00
Novacat
189ecb2e76 Merge pull request #7392 from VOREStation/aro-morphs
Maybe prevent morphs from ending the world
2020-04-22 19:44:27 -04:00
Aronai Sieyes
f1e30a54fb Maybe prevent morphs from ending the world 2020-04-22 19:29:51 -04:00
Novacat
f5175f1aa1 Merge pull request #7389 from VOREStation/upstream-merge-7023
[MIRROR] Roiling Mold Blob Fix/Tweak
2020-04-22 17:49:50 -04:00
Novacat
79a6115017 Merge pull request #7387 from VOREStation/upstream-merge-7009
[MIRROR] Fixes supermatter monitoring EPR indicator showing Undefined
2020-04-22 17:49:25 -04:00
Atermonera
2411a19038 Merge pull request #7023 from Mechoid/FixAndTweakRoiling
Roiling Mold Blob Fix/Tweak
2020-04-22 15:53:57 -04:00
Atermonera
1e4f5aa80e Merge pull request #7009 from atlantiscze/2020_04_17_EPRFix
Fixes supermatter monitoring EPR indicator showing Undefined
2020-04-22 15:48:21 -04:00
Leshana
f3f821cb8f Fix Sundry Runtime Errors XII (#7007)
* Fix Runtime in atoms_movable.dm,597: list index out of bounds

* Fix Runtime in floor_attackby.dm,118: Cannot execute 0.is crowbar().

* Fix null values being present in mob_list.

* Another fix for Runtime in update_icons.dm,254: Cannot execute null.GetUIState().

- This time lets just ensure dna is instantiated no matter who is calling dress_preview_mob().

* Fix Runtime in suit_storage_unit.dm,792: Cannot execute null.set machine().

- Also fixed other mixups of usr vs. user that I found in the same file.

* Fixes Runtime in find_spawning.dm,688: Cannot read null.origin_tech

- if this else if block is reached, new_item must not exist, so we obviously can't set origin_tech on it. Examination of the code seems to suggest the original author intended that for any "talking" items to have arcane and precursor tech; since src is now being made talking, src should get the tech.

* Fix talking artifacts downgrading arcane/precursor tech

- Bump up the values by one for talking artifact items instead of overwriting whatever the value was.
2020-04-22 15:45:32 -04:00
Leshana
323f20cfec Adds "Move" command to atom/movable's VV dropdown that lets you jump it to a coordinate. 2020-04-22 11:43:18 -04:00
Novacat
dd8c48feb4 Merge pull request #7377 from VOREStation/aro-frostflies
Frostfly init fix
2020-04-22 09:12:28 -04:00
Novacat
4271f07e09 Merge pull request #7378 from VOREStation/aro-minesafety
Fix frontier phaser lock locations
2020-04-22 09:12:14 -04:00
Arokha Sieyes
b355af8ae4 Fix frontier phaser lock locations 2020-04-22 02:09:12 -04:00
Aronai Sieyes
7bdd68162b Frostfly init fix 2020-04-22 01:47:43 -04:00
Aronai Sieyes
fabf5e630b Merge pull request #7374 from VOREStation/aro-pgenfixes
Fix some power issues
2020-04-22 01:45:05 -04:00
Unknown
36bdebef12 Uses original values 2020-04-22 01:25:34 -04:00
Aronai Sieyes
5cfe563b72 Power Fixes 2020-04-22 01:23:58 -04:00
Unknown
8d41fd5782 Fixes broken nuclear reactor sprite
Again.
Adjusts power numbers
Another tweak
Fixes Portable Generators
200k safe output
This is incredibly dumb
2020-04-22 00:53:20 -04:00
Aronai Sieyes
d71b127cdb Add micro laser to ARTGs 2020-04-22 00:27:11 -04:00
KasparoVy
eed070851e Enabled the Smelting of Plastitanium
Seems like an oversight - can make titanium (smelting rutile), titanium glass & plastitanium glass but not plastitanium.
2020-04-21 21:42:35 -04:00
Aronai Sieyes
05d983fef2 Merge pull request #7361 from VOREStation/aro-shuttlemove
Make unbuckled shuttle movement more exciting
2020-04-21 16:38:04 -04:00
Aronai Sieyes
c242028f17 Merge pull request #7366 from VOREStation/aro-frienbs
Add friends around the station
2020-04-21 16:37:44 -04:00
Verkister
136697d051 Fixes morph TF overwriting its verbs
It's hard to do stuff like ventcrawling or eating or whatever when the transformation has irreversibly overwritten your mob abilities with the abilities of some whatever inanimate object.
2020-04-21 21:30:49 +03:00
Aronai Sieyes
8327864b05 Add cardboard cutouts 2020-04-21 13:40:08 -04:00
Aronai Sieyes
5dd1d625cc Makes unbuckled shuttle movement more exciting 2020-04-20 21:42:12 -04:00
Aronai Sieyes
a67e2e1791 Merge pull request #7356 from VOREStation/aro-tanks
Tank sprites, foam
2020-04-20 19:48:18 -04:00
Aronai Sieyes
ace05634f5 Merge pull request #7354 from VOREStation/aro-tweaks
Smol Fixes
2020-04-20 19:39:47 -04:00
Aronai Sieyes
534d4657d2 Make it behave the same as water in regards to xenobio 2020-04-20 18:05:51 -04:00
Aronai Sieyes
a2e6467936 FOAAAAAAAM 2020-04-20 17:16:25 -04:00