cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,871 Commits 9 Branches 26 Tags
2a90e57d65e99664dfcb2d325179da04293a2ed9
Commit Graph

24559 Commits

Author SHA1 Message Date
Aronai Sieyes
2a90e57d65 Merge pull request #7464 from Cameron653/SILENCEDMP5A5_FLUFF 
Fixes & Updates Silencedmp5a5's fluff items.
 2020-04-26 18:36:39 -04:00
Aronai Sieyes
36022c95f1 VS: Refactor move code 2020-04-26 16:44:08 -04:00
Aronai Sieyes
d3da6ae4a5 Refactor move code 2020-04-26 16:42:50 -04:00
C.L
3fc0f548f4 Well that was embarrasing 
Got rid of "desc =" from the description.
 2020-04-26 14:11:35 -04:00
Cameron653
1e29d2a734 Fixes & Changes Silencedmp5a5's fluff items. 2020-04-26 13:59:58 -04:00
Aronai Sieyes
5874df8756 Merge pull request #7460 from VOREStation/aro-stationlevels 
Fix what's considered station levels
 2020-04-26 12:22:59 -04:00
Aronai Sieyes
d32bd122e5 Merge pull request #7461 from VOREStation/aro-roboar 
Add AR to borgs
 2020-04-26 12:22:47 -04:00
Aronai Sieyes
bed4f26f95 Fix what's considered station levels 2020-04-26 12:10:29 -04:00
Aronai Sieyes
3c6c4ece12 Add AR to borgs 2020-04-26 12:09:06 -04:00
Aronai Sieyes
fff304494b Avoid byond \improper behavior 2020-04-26 11:40:17 -04:00
Aronai Sieyes
37e5bd237e Merge pull request #7434 from VOREStation/upstream-merge-6994 
[MIRROR] [PORT] Refactor the gameticker controller into SSticker
 2020-04-26 11:33:02 -04:00
Aronai Sieyes
5530d5f0ce Merge pull request #7437 from VOREStation/upstream-merge-7025 
[MIRROR] Removes stray unused variable that triggered a compile warning
 2020-04-26 11:32:32 -04:00
Aronai Sieyes
c213aa2f06 Merge pull request #7444 from VOREStation/aro-panellist 
Redoes vorepanel to different text generation mechanism
 2020-04-26 11:31:18 -04:00
Unknown
dfedf60c0f Requested Changes 2020-04-26 10:58:56 -04:00
Atermonera
45dec7760e Space spaced through open space looks like space (#7018) 
* Space spaced through open space looks like space

* Unnecessary update_icon
 2020-04-26 03:24:42 -04:00
Atermonera
7f6b583b24 Merge pull request #7025 from atlantiscze/2020_04_21_Cleanup 
Removes stray unused variable that triggered a compile warning
 2020-04-25 16:36:34 -04:00
Aronai Sieyes
52748c2ddc Redoes vorepanel to different text generation mechanism 2020-04-25 16:26:22 -04:00
Leshana
c789cad22e Change to use to_world and add wrapping spans. 2020-04-25 16:15:03 -04:00
Novacat
d9b837dab1 Merge pull request #7439 from VOREStation/upstream-merge-7032 
[MIRROR] Excludes AI shells from event probability calculations
 2020-04-25 16:13:09 -04:00
Novacat
e37adba16e Removes cataloguer from sci borg 2020-04-25 16:00:22 -04:00
Atermonera
629b2711d1 Merge pull request #7034 from atlantiscze/2020_04_23_RobotXenoarch 
Adds basic xenoarch & exploration equipment to research robot module
 2020-04-25 15:59:04 -04:00
Atermonera
1130462867 Merge pull request #7032 from atlantiscze/2020_04_22_ShellExclude 
Excludes AI shells from event probability calculations
 2020-04-25 15:56:37 -04:00
Atermonera
885c404bff Merge pull request #7014 from KasparoVy/clothe_the_teshari 
Adds Colorable Apron & Tesh Labcoat
 2020-04-25 15:39:54 -04:00
Aronai Sieyes
667fbebbc7 Merge pull request #7406 from VOREStation/vplk-optimize-for-static-power 
Optimize some machines for static power
 2020-04-25 15:06:50 -04:00
Aronai Sieyes
b2b47054da Merge pull request #7430 from ShadowLarkens/fixlangs 
Fix language keys not working after multilingualism
 2020-04-25 15:06:23 -04:00
Aronai Sieyes
2b4be2639b Merge pull request #7428 from VOREStation/aro-vcicon 
Fix in-round built void core icon updating
 2020-04-25 15:05:55 -04:00
ShadowLarkens
6835103f31 Fix language keys not working after multilingualism 
Sort of a "fix", sort of a tweak; the system deliberately never checked
for anything but the lowercase version of a language key to make it
easier to use, but a lot of the VOREStation languages use uppercase
invocation keys. Easy enough to fix by just making it check for the
literal version of the key instead of the lowertext version.
 2020-04-25 11:29:49 -07:00
Aronai Sieyes
e802abcbdc Fix in-round built void core icon updating 2020-04-25 14:26:04 -04:00
Aronai Sieyes
d8677a79c7 Merge pull request #7427 from VOREStation/aro-prefixes 
Forbid and sanitize out hyphen as language prefix
 2020-04-25 13:36:26 -04:00
Aronai Sieyes
0b79828ec9 Forbid and sanitize out hyphen as language prefix 2020-04-25 13:03:47 -04:00
Leshana
742a9b16c9 Fix gas thrusters turning off when trying to burn. 
They expected use_power_oneoff to return the amount of power that *couldn't* be used, but they return the amount of power that *could*
 2020-04-25 12:45:13 -04:00
Leshana
4c6e6bc04c Terminals do not need to process! global.machines is a separate list from processing_machines 2020-04-24 22:06:20 -04:00
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