cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 22:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,851 Commits 13 Branches 0 Tags
37e5bd237e8de88a9a07421db35acfba08df5708
Commit Graph

37216 Commits

Author SHA1 Message Date
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
279f0c25dc Merge pull request #7438 from VOREStation/upstream-merge-7026 
[MIRROR] More machinery power update_var() proc usage
 2020-04-26 11:32:13 -04:00
Aronai Sieyes
83a62b268a Merge pull request #7442 from VOREStation/upstream-merge-7036 
[MIRROR] Fixes Intellicore grabbing AI multiple times
 2020-04-26 11:31:55 -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
Aronai Sieyes
c6ac571719 Merge pull request #7457 from Novacat/nova-basicfixes 
512 Compile, Ship Console Access Fix
 2020-04-26 11:30:53 -04:00
Aronai Sieyes
e92fa8b792 Merge pull request #7452 from VOREStation/aro-areamsg 
Remove unnecessary code, replace with area enter messages
 2020-04-26 11:30:44 -04:00
Aronai Sieyes
90fca7774d Merge pull request #7446 from VOREStation/aro-bsbp 
Tweak bluespace backpack radio
 2020-04-26 11:30:34 -04:00
Unknown
dfedf60c0f Requested Changes 2020-04-26 10:58:56 -04:00
Arokha Sieyes
5192204285 Fix bad copypaste that broke sleevemates 2020-04-26 10:37:27 -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
Arokha Sieyes
fc249c5561 Remove unnecessary code, replace with area enter messages 2020-04-25 23:07:15 -04:00
Aronai Sieyes
7a3b4fe041 Tweak bluespace backpack radio 2020-04-25 18:40:32 -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
16a9d2575c Add vv_edit_var to ensure VV edits call our update procs too. 2020-04-25 16:24:15 -04:00
Atermonera
631a544ddb Merge pull request #7036 from atlantiscze/2020_04_24_IntellicoreFix 
Fixes Intellicore grabbing AI multiple times
 2020-04-25 16:23:12 -04:00
Leshana
d02a55920e Added filtering spans by specific request of Polaris. 2020-04-25 16:15:13 -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
9f121d0267 Merge pull request #7440 from VOREStation/upstream-merge-7031 
[MIRROR] Fixes Phazon and Janus being unable to phase
 2020-04-25 16:12:57 -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
d14e64f0ce Merge pull request #7031 from atlantiscze/2020_04_22_JanusFix 
Fixes Phazon and Janus being unable to phase
 2020-04-25 15:56:48 -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
a2498bbb79 Merge pull request #7429 from VOREStation/aro-inducerhit 
Prevent accidental whaps with inducers
 2020-04-25 15:06:06 -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
Aronai Sieyes
8a7d4f08cb Prevent accidental whaps with inducers 2020-04-25 11:20:12 -04:00
Leshana
ea0fc2d205 Holopads only need to process when someone is using them. 2020-04-24 22:06:20 -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
Leshana
86e41f7dd6 Airlocks only need to process when they are obeying a command or counting down a timer. 2020-04-24 22:06:20 -04:00
Leshana
5b28bbd536 Doors only need to process when they are attempting to autoclose. 2020-04-24 22:06:20 -04:00
Leshana
1b0eeb79e4 Firedoors should only process when they are closed. 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
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