cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,025 Commits 5 Branches 0 Tags
1d59d8683c204b85330be8c70c76505f9f3f7e76
Commit Graph

917 Commits

Author SHA1 Message Date
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
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
4b19e3a9b3 Merge pull request #4538 from VOREStation/upstream-merge-5726 
[MIRROR] Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
 2019-02-23 12:01:38 -05:00
Spades
190ead1dfd Merge pull request #4552 from VOREStation/upstream-merge-5748 
[MIRROR] Adds ability to selectively disable submap rotation.
 2019-02-23 11:45:49 -05:00
Unknown
20f257e20e [5726] Makes this PR Compile 2019-02-17 18:22:43 -05:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Atermonera
439afee2ab Unclogs powersink drains 2019-01-26 17:54:34 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Anewbe
ebf62629b5 Adds ability to selectively disable submap rotation. 2018-12-05 17:16:27 -05:00
Atermonera
bf86b408fa Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed 2018-12-03 20:21:17 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
ArgobargSoup
32813814c8 Update to scheduler because Aro said so 
Lets the callback cooldown for bell collars work.
 2018-11-12 16:26:29 -08:00
Anewbe
549adf6baf Merge pull request #5719 from lbnesquik/Kates-Typo-fix 
Minor typo fix
 2018-10-30 13:06:43 -04:00
Arokha Sieyes
30a8a3ce31 VS edit merges 2018-10-20 17:37:08 -04:00
Neerti
3a9c13b937 Ports Vote to SMC 2018-10-20 01:53:13 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Spades
eb94467f39 Merge branch 'master' into upstream-merge-5432 2018-09-09 17:57:31 -04:00
Spades
8b7fbbe98c Merge branch 'master' into upstream-merge-5424 2018-09-01 18:40:37 -04:00
Spades
a60d61f594 Update planets.dm 2018-09-01 18:39:06 -04:00
Atermonera
50efc3c01f Merge pull request #5502 from Anewbe/glob_is_hungry_for_souls 
Partially ports the GLOB system
 2018-08-22 11:32:13 -07:00
Anewbe
6ef5940260 Merge pull request #5507 from Verkister/patch-14 
Fixes incorrect ETA in crew transfer announcement
 2018-08-19 00:05:49 -04:00
Verkister
e02cb60542 Fixes incorrect ETA in crew transfer announcement 2018-08-18 12:27:55 +03:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Neerti
6ffd299fd7 Merge pull request #5461 from Atermonera/supply_nanoUI 
Refactors supply controller
 2018-08-04 02:55:15 -04:00