cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,956 Commits 6 Branches 0 Tags
6ebd2497489eb8aef5d0da7c1650d4a26e800371
Commit Graph

24596 Commits

Author SHA1 Message Date
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes
82a41c8d7a Merge pull request #7507 from VOREStation/aro-gravytopple 
Refine gravity generator FSM
 2020-04-29 14:13:57 -04:00
Aronai Sieyes
6cd52ff500 Merge pull request #7498 from VOREStation/aro-uav 
Adds UAVs
 2020-04-29 14:13:29 -04:00
Aronai Sieyes
390943784c Refine gravity generator FSM 2020-04-29 13:10:44 -04:00
Aronai Sieyes
ec0b316730 Merge pull request #7502 from VOREStation/aro-nogravyshuttle 
Have gravity generator ignore /area/shuttle
 2020-04-29 11:41:01 -04:00
Aronai Sieyes
3daef7673f Merge pull request #7494 from VOREStation/upstream-merge-6990 
[MIRROR] Refactor telecomms and consoles to operate on logical zlevels
 2020-04-29 11:40:20 -04:00
Aronai Sieyes
6dfef88a3c Merge pull request #7488 from VOREStation/aro-hydroviro 
Hydroponics and virology machine icons
 2020-04-29 10:29:48 -04:00
Aronai Sieyes
c2ca984d18 Merge VS changes for telecomms 2020-04-29 10:24:37 -04:00
Aronai Sieyes
49f5a1c4ed Have gravity generator ignore /area/shuttle 2020-04-29 09:31:18 -04:00
ShadowLarkens
463186212e Fix hear_sleep whoops 2020-04-28 22:51:22 -07:00
Aronai Sieyes
e8c068912c Fix MC nav icon 2020-04-28 23:18:48 -04:00
Aronai Sieyes
fb87fbe2d7 VS: Add UAV 2020-04-28 23:18:27 -04:00
Aronai Sieyes
0c2f8cedb5 Add UAV, UAV software 
Design placed in mechfab
 2020-04-28 23:18:08 -04:00
Atermonera
bdf186d16b Merge pull request #7024 from atlantiscze/2020_04_21_ValveProgram 
Converts Shutoff valve monitoring into a MC program
 2020-04-28 17:57:51 -04:00
Atermonera
eb6eb7bcd6 Refactor telecomms and consoles to operate on logical zlevels 2020-04-28 17:56:35 -04:00
Aronai Sieyes
ac33ebcdec Hydroponics and virology machine icons 
There's crossover, I guess, for some reason!
 2020-04-27 17:46:20 -04:00
Unknown
47e2e1a2e4 Removes duplicate var 2020-04-27 17:12:41 -04:00
Unknown
356fe4fced Fixes Kisuke's gunsword 2020-04-27 17:10:59 -04:00
Aronai Sieyes
8e9f51c133 Merge pull request #7481 from VOREStation/aro-prot 
Prevent protean repairs using fire and cables
 2020-04-27 14:58:28 -04:00
Aronai Sieyes
57f28af1fd Prevent protean repairs using fire and cables 
Doesn't make much sense
 2020-04-27 11:18:03 -04:00
Aronai Sieyes
f2e6280161 Merge pull request #7479 from VOREStation/SERDYKOVKITFIX 
Allows Serdy's modkit to be selected.
 2020-04-27 10:57:33 -04:00
Aronai Sieyes
45b67c5948 Merge pull request #7321 from KillianKirilenko/kk-collar 
Colorable Collar/Choker Accessory
 2020-04-27 10:56:08 -04:00
Cameron653
9eaea818b7 Allows Serdy's modkit to be selected. 2020-04-27 10:43:38 -04:00
Aronai Sieyes
3f6ce31f9a Merge pull request #7453 from InterroLouis/Hiss 
Hiss, not His
 2020-04-27 09:56:52 -04:00
Aronai Sieyes
c2e8ff0761 Merge pull request #7475 from VOREStation/vplk-fix-light-movement 
Fix /Moved() that doesn't call parent.
 2020-04-27 09:54:06 -04:00
Aronai Sieyes
ec5bfa3e4b Merge pull request #7477 from VOREStation/aro-vcdbsafe 
World.time can't possibly be null, and yet...
 2020-04-27 09:53:58 -04:00
Aronai Sieyes
5f0f04bcff Merge pull request #7472 from KasparoVy/clothe-the-taurs-ffs 
Aprons & Old Poncho for Most Taurs, Fix Tesh Labcoat
 2020-04-27 09:53:13 -04:00
Arokha Sieyes
92a0f94b60 World.time can't possibly be null, and yet... 2020-04-27 01:21:35 -04:00
Leshana
cfac8f99f3 Fix /Moved() that doesn't call parent. 2020-04-26 23:51:58 -04:00
Aronai Sieyes
93f9d2f552 VS: Changes for AI refactor, makes voremobs behave more sane 2020-04-26 23:44:42 -04:00
Aronai Sieyes
8ec31c9aa4 Refactor AI into two subsystems and clean up targeting some 2020-04-26 23:32:45 -04:00
KasparoVy
c433d6e386 Blue/Colourable/Surgical Aprons & Old Poncho for Most Taurs 
Just getting this done - soon (TM) I'll be working on regular cloaks & ponchos.

Blue, colourable & surgeon apron
Mexican poncho

Added for cow, deer, drake, feline, horse, lizard, naga, otie, slug & wolf taurs (where missing).

Minor sprite adjustment to drake taur's Mexican poncho.
 2020-04-26 20:52:26 -04:00
Aronai Sieyes
d8cc52070a Merge pull request #7469 from Natje0/master 
Removes Healrod due to MISTAKES MADE and new ideas
 2020-04-26 18:56:58 -04:00
Natje0
85b1d7fb2b Removes Healrod due to MISTAKES MADE 
I managed to push the wrong sprite sets. This one's nearly impossible to see the charge meter of, and is just... Obnoxious.
Additionally, I've got new plans of how to make this darn thing, and thus I'm scrapping this project in favor of a new one! Thiiink I got all of them.
 2020-04-27 00:37:05 +02:00
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
InterroLouis
f69457f0f9 Update emote_vr.dm 2020-04-26 01:22:36 -04:00