cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,289 Commits 5 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

1161 Commits

Author SHA1 Message Date
Hawk_v3
5f92049ed7 Yeah no, we like our long rounds. 
Minimal changes to code.
 2019-04-22 21:05:56 +01:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04:00
Heroman3003
1a9cdecb32 Finishes timeclock duty switching functionality 2019-04-19 10:28:38 +10:00
Novacat
557a36e2e5 Conflict Resolution 2019-04-18 13:47:28 -04:00
Atermonera
7f97c8e7cc Makes transfer always occur if nobody is playing. 2019-04-18 13:45:57 -04:00
Heroman
bc74ea53c9 Removes Command from appearing for players who had it removed 2019-04-15 18:14:04 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Novacat
629748faec Merge pull request #5048 from VOREStation/upstream-merge-6065 
[MIRROR] Allows restriction of z-levels from spawning xenoarch finds
 2019-04-14 03:08:41 -04:00
Novacat
36e7814477 Update xenoarch.dm 2019-04-14 02:51:07 -04:00
Neerti
49628739b2 Allows restriction of z-levels from spawning xenoarch finds 2019-04-14 02:29:17 -04:00
Neerti
2203f368e8 Merge pull request #6037 from Heroman3003/report-the-crate-cost-lazy-central-interns 
Fixes export reports not mentioning crates' cost
 2019-04-14 02:28:02 -04:00
Heroman
82b9508b0e Makes nanoui apply properly to roundstart clients 2019-04-12 16:18:54 +10:00
Dwaggy
4e6db4ad04 Change to configuration.dm 
-Enabled the recent change to AI control, allowing them to *actually* take over the remote AI_Shell made borgs
(currently this feature exists, shells can be made. but the AI got no verb to take over. leaving them forever a husk)
this allows them to double click a borg with the AI_Shell component installed in to it and take over control
Not entirely sure why this is.. only half-enabled by default. especially when they totally deleted the ability to also make/control the small engineering drones.
 2019-04-12 06:54:48 +01:00
Novacat
af4b960d8e Merge pull request #4996 from Heroman3003/safety-first 
Fixes xenoarch spawning on station levels
 2019-04-11 15:56:14 -04:00
Heroman3003
95b2c63b85 Allows restriction of Z-levels for xenoarch spawning 2019-04-11 09:55:06 +10:00
Novacat
552cafdb47 Merge pull request #4970 from Novacat/nova-ert 
Emergency Chemistry/NanoUI/Timer subsystem fixes
 2019-04-10 19:39:51 -04:00
Unknown
cecbac2831 Emergency fix to Timer Subsystem 2019-04-10 18:53:15 -04:00
Heroman3003
b85d43bc21 Allows ghosts with backups to ping medical again 2019-04-09 10:28:55 +10:00
Unknown
dcd2a1f606 Ports Chemistry/NanoUI Fixes Early 
Direct port of https://github.com/PolarisSS13/Polaris/pull/6039
 2019-04-08 16:15:29 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Novacat
f8a2ab2fd3 Merge pull request #4954 from Heroman3003/ptoening 
Removes collection of command PTO
 2019-04-08 15:17:07 -04:00
Heroman
59f369c3ef Prevents translocator beacons from being sent away 2019-04-08 17:10:28 +10:00
Heroman
032daec451 Removes collection of command PTO 2019-04-08 15:10:58 +10:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
2c07c85138 Adds New Alert Levels (#6019) 
* Adds New Alert Levels
 2019-03-30 18:29:12 -04:00
Neerti
256fb03dcc Merge pull request #5942 from Anewbe/headgibs 
Headgibbing is a config thing
 2019-03-28 20:38:34 -04:00
Novacat
0b71310df5 Merge pull request #4732 from VOREStation/upstream-merge-5909 
[MIRROR] AFK Kicker stores AI cores
 2019-03-28 17:25:22 -04:00
Novacat
b004d7d847 Merge pull request #4721 from VOREStation/upstream-merge-5901 
[MIRROR] Unclogs powersink drains
 2019-03-28 15:49:58 -04:00
Unknown
5e6e193fb3 Rebases this correctly 2019-03-28 15:24:27 -04:00
Novacat
56752a1337 Merge branch 'master' into upstream-merge-5901 2019-03-28 14:37:02 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Atermonera
db1fdccdd5 Merge pull request #5898 from Anewbe/more_gibberish 
Removes the hyphen from default language keys, should make people spew gibberish less
 2019-03-27 21:15:27 -04:00
Unknown
a22ada82f1 Reminder: Yell at Leshana for not tagging edited code. 2019-03-27 20:03:23 -04:00
kevinz000
e105a047e1 Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc 2019-03-27 19:36:07 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Unknown
0e6c82ed60 Conflict Resolution 2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Unknown
0424f4b907 More Fixes 2019-03-27 04:22:08 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Unknown
95f57bb8c7 Conflict Fixes 2019-03-27 02:19:02 -04:00
Neerti
1dd3bb4532 Stops initialization from grinding to a halt when loading maps 2019-03-27 01:49:25 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00