cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,306 Commits 7 Branches 0 Tags
2374a40908efd30a1ca0a3e7ddeec467f39560c3
Commit Graph

36897 Commits

Author SHA1 Message Date
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Aronai Sieyes
a727b703b6 Merge pull request #7207 from Runa-Dacino/Horned-elves 
Adds new ear options
 2020-04-12 23:00:40 -04:00
Aronai Sieyes
a8402f0df1 Merge pull request #7216 from VOREStation/upstream-merge-6966 
[MIRROR] Refactor away area/New()
 2020-04-12 22:56:50 -04:00
Aronai Sieyes
984415e9c9 Merge pull request #7177 from VOREStation/sscleanup/openspace 
Refactor the Open Space controller into MC Subsystem
 2020-04-12 21:55:20 -04:00
Leshana
865303e481 Removed area.uid var and /area/New() 
- var/uid was used in only a handful of places.  Because areas are singletons
  it is safe to replace the uid with \ref, areas don't get deleted.
- And with that /area/New() is empty, we can remove it!
 2020-04-12 18:05:09 -04:00
Leshana
262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Leshana
859036b7cd Merge pull request #7176 from VOREStation/vplk-glass-firedoors 
Make glass firedoors constructable/deconstructable.
 2020-04-12 11:51:46 -04:00
Runa Dacino
4c612bda81 Switches "Yes" and "no" for Request spice 
https://github.com/VOREStation/VOREStation/issues/7133

states that it's very easy to accidentally press yes using the current layout.
 2020-04-12 14:31:44 +02:00
Atermonera
83c1a512e2 Adds pref to toggle vchat without 60s wait for linux users (#6980) 2020-04-12 00:51:57 -04:00
Novacat
57a78c5e72 Update mapping_helpers.dm 2020-04-11 23:49:58 -04:00
Atermonera
92792fd0dc Adds airlock setup helpers 2020-04-11 23:49:15 -04:00
CRTXBacon
b1dde97d98 Add files via upload 2020-04-12 02:05:14 +01:00
CRTXBacon
c78ffd954e Add files via upload 2020-04-12 02:04:18 +01:00
Leshana
65546d4e28 Merge pull request #7150 from VOREStation/sscleanup/ticker 
Refactor the gameticker controller into SSticker
 2020-04-11 19:28:37 -04:00
Aronai Sieyes
e3b39a56af Merge pull request #7205 from VOREStation/upstream-merge-6974 
[MIRROR] Unfucks arrival shuttle latejoins when shuttle is docked
 2020-04-11 15:39:28 -04:00
Novacat
0a52a3c81d Merge pull request #7206 from VOREStation/upstream-merge-6982 
[MIRROR] Fix VV on lists
 2020-04-11 10:10:14 -04:00
Runa Dacino
fd4410cc71 Adds new ear options 
Since in fiction, demons often possess pointy ears (and for my own needs), I have decided to enable our demonic degenerates to have pointy ears in addition to fancy horns!

Ram-like (caprine), backwards and forward pointing classic demon, oni and finally those large backswept dragon horns can now be picked alongside a pair of elven ears. 

Both the ears and the horns are separately colourable. Ears are first option, horns are second.
 2020-04-11 15:24:14 +02:00
Atermonera
8aea6f9788 Merge pull request #6982 from VOREStation/vplk-fix-vv-lists 
Fix VV on lists
 2020-04-11 02:56:48 -04:00
Atermonera
07fb7950a6 Merge pull request #6974 from Shadow-Quill/patch-1 
Unfucks arrival shuttle latejoins when shuttle is docked
 2020-04-11 02:51:26 -04:00
Atermonera
0bfbf2c022 Merge pull request #6981 from VOREStation/vplk-overal-missed-fixes 
Port followup misc fixes
 2020-04-11 02:51:16 -04:00
Heroman
f5e8ccd250 Adjust chances for spawnin events 2020-04-11 10:40:40 +10:00
Leshana
178d48c253 Accepting alternative Polaris code for the sake of merge simplification. 2020-04-10 19:48:00 -04:00
Leshana
c6b970079c Fix openspace redering of under-objects that have no main icon (only over/underlays) 
In particular stops manifolds from getting the openspace "map" icon state as its main icon instead of null.
 2020-04-10 12:10:31 -04:00
Leshana
5bf15efcbc Refactor the Open Space controller into MC Subsystem 
- Basically just refactor doWork() into fire() with the capablity to return in the middle with MC_TICK_CHECK.
- Move some vars around to be more organized.
- Only functional change is that when a turf is queued twice in one cycle, the second queue moves it to the end of the list instead of it being in the queue twice
 2020-04-10 12:10:21 -04:00
Leshana
4c25dc91df Commit move of open_space_controller.dm to subsystems folder to track history through rename. 2020-04-10 12:07:07 -04:00
Leshana
a96caa5f70 Update Lobby stat panel to show voting and server init status. 2020-04-10 11:41:38 -04:00
Leshana
6555799119 Revamp Start Now admin verb to actually wait until init is done before starting. 2020-04-10 11:41:38 -04:00
Leshana
6dc9ecd1af Fix: Only call autogamemode vote once. 2020-04-10 11:41:38 -04:00
Leshana
c4a8aa2b7b Refactor the gameticker into SSticker 
- Instead of independently spawn'd while/sleep loops, it stores its state and lets the MC fire it.
  - Convert relative path indentation procs to absolute path as per modern style standards.
  - Break apart the inner loops into separate procs so you can see what is actually going on.
  - It now shows up in MC tab, along with stats about what phase it is in.
 2020-04-10 11:41:38 -04:00
Leshana
a794fecea0 Move gameticker to subsystem folder before editing to track history thru rename. 2020-04-10 11:37:46 -04:00
Aronai Sieyes
10ffcd32aa Merge pull request #7154 from VOREStation/aro-pipes 
Adds 2 new pipe types
 2020-04-10 10:18:46 -04:00
Novacat
63ca37f411 Merge pull request #7175 from VOREStation/fix-adminload-atmos 
Fix offline vent pumps and scrubbers on loaded maps.
 2020-04-10 08:50:15 -04:00
Novacat
98c2c64b7e Merge pull request #7185 from VOREStation/upstream-merge-6939 
[MIRROR] Update assemblies to modern coding standards
 2020-04-10 08:46:54 -04:00
Novacat
dbb756bc99 Merge pull request #7183 from KasparoVy/let-em-know 
Clarify Primary Nutrition Source
 2020-04-10 08:41:03 -04:00
Novacat
26b65233ae Merge pull request #7191 from VOREStation/upstream-merge-6976 
[MIRROR] Employment records use comments like medical records
 2020-04-10 08:40:11 -04:00
Novacat
b6187876a7 Merge pull request #7190 from VOREStation/upstream-merge-6973 
[MIRROR] Ingested ethylredox removes ingested alcohol
 2020-04-10 08:39:56 -04:00
Novacat
fc7284ca1a Merge pull request #7189 from VOREStation/upstream-merge-6969 
[MIRROR] Adds preference to output description_info with examine text
 2020-04-10 08:39:33 -04:00
Novacat
720b6eefa0 Merge pull request #7188 from VOREStation/upstream-merge-6955 
[MIRROR] Increases SSjobs init priority so it's accessible earlier
 2020-04-10 08:39:14 -04:00
Novacat
969440514c Update unsorted.dm 2020-04-10 08:38:25 -04:00
Atermonera
3fb42571ab Employment records use comments like medical records (#6976) 2020-04-10 01:25:49 -04:00
Atermonera
def2600bc0 Ingested ethylredox removes ingested alcohol (#6973) 2020-04-10 01:22:33 -04:00
Atermonera
a85b953ef4 Adds preference to output description_info with examine text (#6969) 
* Adds preference to output description_info with examine text

* includes the defines file
 2020-04-10 01:21:21 -04:00
Atermonera
ba4af183f4 Increases SSjobs init priority so it's accessible earlier (#6955) 2020-04-10 01:20:08 -04:00
Atermonera
7249375011 Splits circuit clothes IC interaction to ctrl-shift-click (#6968) 2020-04-10 01:19:48 -04:00
Atermonera
20b807752e Update assemblies to modern coding standards 2020-04-10 01:16:32 -04:00
KasparoVy
a6c042e4a4 Clarify Primary Nutrition Source 
Issue #7181
 2020-04-10 00:04:47 -04:00
Unknown
c1e3ad59b1 removing these would work better prolly 2020-04-09 12:02:08 -04:00
Unknown
ad082f1755 Fixes boot visibility with techpriest robes 2020-04-09 11:45:59 -04:00
Atermonera
856cd8072a Merge pull request #6959 from ShadowLarkens/uplink_redesign 
Syndicate Uplink redesign (Inspired by ParadiseSS13/Paradise#1844)
 2020-04-09 02:59:16 -04:00
Leshana
8dffa36249 Make glass firedoors constructable/deconstructable. 2020-04-09 00:04:19 -04:00