cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,298 Commits 7 Branches 0 Tags
ba20f079f2935e46da6b4be99d72b4f2b23cb8e3
Commit Graph

24342 Commits

Author SHA1 Message Date
Aronai Sieyes
ba20f079f2 Fix startends 2020-04-12 20:51:07 -04:00
Aronai Sieyes
3a41cf0656 Make shield sprites look nicer hopefully 2020-04-12 20:51:07 -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
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
Novacat
0a52a3c81d Merge pull request #7206 from VOREStation/upstream-merge-6982 
[MIRROR] Fix VV on lists
 2020-04-11 10:10:14 -04: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
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
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
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
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
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
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
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
Leshana
eac8efc96a Suspend SSmachines subsystem while we are initializing map templates. 
- Adds the capability to "suspend" a subsystem while we're loading something.
 2020-04-08 22:42:00 -04:00
Leshana
9a4b3f7c8b Merge pull request #7159 from VOREStation/aro-fixes 
2 fixes and Teshari maws
 2020-04-08 19:30:35 -04:00
Leshana
81dfe61c7b Merge pull request #7145 from VOREStation/aro-randomfixes 
Fix 2 minor issues
 2020-04-08 19:26:14 -04:00
Novacat
f3023f1dcf Merge pull request #7160 from KasparoVy/in_its_rawest_form 
Increases the Potential of Ore Eater & Adds Adminbus
 2020-04-08 15:24:22 -04:00
Novacat
1d39b45870 Merge pull request #7116 from Heroman3003/slimedjust 
Re-enables Slime Vore reaction, adjusts blocked lists for slimespawn reactions
 2020-04-08 15:16:04 -04:00
Novacat
dc8d890009 Merge pull request #7167 from Verkister/mousesketty 
Fixes mob update_transform proc and mouse sizing
 2020-04-08 15:15:19 -04:00
Unknown
9320b2c641 Fixes two bugs 
- Voidsuits now properly have their species restrictions initially set.
- You can no longer get perma invisibility from deadringer.
 2020-04-08 15:05:10 -04:00
MrSign
03005ad3d8 Update loadout_fluffitems_vr.dm 2020-04-08 14:33:30 +10:00
Aronai Sieyes
ce8bda7cd7 Merge pull request #7118 from VOREStation/vplk-shields 
Ports Baystation Advanced Shield Generators
 2020-04-07 23:53:12 -04:00
MrSign
2ab6a85f22 Update loadout_fluffitems_vr.dm 2020-04-08 12:21:32 +10:00
Novacat
df56730bf7 Merge pull request #7140 from Novacat/nova-heterochromia 
Adds Vespa Medals
 2020-04-07 22:00:42 -04:00
Verkister
a95e1a61ef Fixes mob update_transform proc and mouse sizing 
-Fixes update_transform proc for mobs. Meaning that the proc now actually does something and that mobs with pre-set size multipliers now spawn in the correct size.
-Removes some textbook spaghetti code that was making mice spawn in double (triple?) feigned size multipliers in order to be scoopable. Instead makes miniscule (mob_size var) mobs (such as mice) scoopable by default.
-This also fixes morphs in mouse form becoming tiny.
 2020-04-07 19:41:44 +03:00
Leshana
aaa0fa5539 Cleanup code and comments. 
- Refactor ion_storm to actually operate using start()/end()/announce()
- Remove unused variable and enhance comments.
 2020-04-07 03:37:10 -04:00
Novacat
9b73b67ddc Merge branch 'master' into upstream-merge-6923 2020-04-07 00:59:54 -04:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -04:00
KasparoVy
b4d290b7c2 Increases the Potential of Ore Eater & Adds Adminbus 
It can now be effectively granted to non-humans, who can now eat ore if they click it while NOT on help intent.
Additionally, you can now feed ore to mobs that can eat it.
 2020-04-06 22:18:00 -04:00
Leshana
d66f508541 Fixes for vorestation merge of "Rewrites the Rewritten Event System" 
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
 2020-04-06 17:31:26 -04:00
Leshana
08c2d2db6e Remove non-global references to SSgameMaster and SSevent_ticker 
- Best practice to avoid holding onto references to the subsystem instances aside from the global variables. (In case of restart/recover etc).
- The reference to GM was entirely unused by any event or meta-event.  /datum/game_master would work fine using the global refs.
 2020-04-06 17:28:11 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix 
Rewrites the Rewritten Event System
 2020-04-06 16:23:39 -04:00
Aronai Sieyes
2ae64859cc VS: Add a couple more views to the emagged looking glass console 2020-04-06 12:11:03 -04:00
Arokha Sieyes
f0bc46cc49 Add 2 new pipe types 2020-04-05 23:05:33 -04:00
Unknown
9f9e0b329d Reverts old vorestation edits 2020-04-05 22:26:34 -04:00