Commit Graph

37175 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
964ee80526 Merge pull request #7411 from AmayaWah/plastitaniumwalls
Adds plastitanium r_wall and normal wall + wall_masks icons for them.
2020-04-24 21:07:57 -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
Aronai Sieyes
b3d1a103ac Fix human charging 2020-04-24 12:38:45 -04:00
Amaya
858b45c17b splits into _vr type 2020-04-24 15:47:05 +02: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
Leshana
e36410de25 Address static power review suggestions. 2020-04-23 23:00:23 -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
ba7da5b9b8 Add VV command for debugging area static power. 2020-04-23 19:04:34 -04: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
Leshana
19d1979d63 Remove extra ..() from /turf/Entered 2020-04-23 18:48:52 -04:00
Aronai Sieyes
a62a2e4072 WAH 2020-04-23 18:15:55 -04:00
Aronai Sieyes
897120f895 Merge pull request #7402 from VOREStation/aro-radialtrans
Add radial menu to translocator
2020-04-23 17:47: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
fcfd4bf889 Add radial menu to translocator 2020-04-23 17:32:12 -04:00
Aronai Sieyes
45fd68ca88 Tweak fakecell qdel time to be higher just in case 2020-04-23 16:03:28 -04:00
Aronai Sieyes
be6f4e0da0 Add inducer designs, make protolathe take titanium 2020-04-23 15:57:33 -04:00
Aronai Sieyes
2ea192ab87 Port/improve /tg/ Inducer 2020-04-23 15:57:17 -04:00
Aronai Sieyes
55e177a076 Port/improve /tg/ RCD 2020-04-23 15:34:32 -04:00
Holdelta
0973b02dd5 Update global_vr.dm 2020-04-22 17:58:43 -07: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
680934de9c Merge pull request #7391 from Novacat/nova-basicfixes
Adds a bunch of adminbus backpacks
2020-04-22 19:44:38 -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
aaf4a279dc Merge pull request #7390 from VOREStation/upstream-merge-7012
[MIRROR] Fixes HE pipes not leaking when breached
2020-04-22 18:08:48 -04:00
Unknown
d6ecbda3d4 One too many vars 2020-04-22 18:08:05 -04:00
Unknown
9ab813c8e3 Adds a bunch of adminbus backpacks 2020-04-22 17:53:19 -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
d7115ab14c Merge pull request #7388 from VOREStation/upstream-merge-7015
[MIRROR] Airlock Description Error
2020-04-22 17:49:38 -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
97e270d8c5 Merge pull request #7012 from atlantiscze/2020_04_18_LeakFix
Fixes HE pipes not leaking when breached
2020-04-22 17:47:32 -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
bc7ad5ac7a Merge pull request #7015 from Shadow-Quill/AirlockMessage
Airlock Description Error
2020-04-22 15:51:39 -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