cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,115 Commits 8 Branches 0 Tags
466516b066cf9e64e90d1f4109f0f41cd4b5fe28
Commit Graph

2119 Commits

Author SHA1 Message Date
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Unknown
128229c12e Ports kick fix early 2019-04-06 12:22:51 -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
Novacat
c570f25dd8 Merge branch 'master' into upstream-merge-5905 2019-03-28 14:55:54 -04:00
Unknown
2767f5917d Fixes Conflict 2019-03-28 14:49:44 -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
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Unknown
55b4d304f5 Conflict Resolution Part One 2019-03-27 15:21:58 -04:00
Novacat
7bd0f8e2db Merge pull request #4676 from VOREStation/upstream-merge-5820 
[MIRROR] Makes IC ticket response less rude
 2019-03-27 15:18:06 -04:00
Novacat
a9f4906995 Merge pull request #4667 from VOREStation/upstream-merge-5772 
[MIRROR] Refactors poi rotation to use degrees instead of dir
 2019-03-27 15:16:02 -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
Neerti
ee18328ce0 Refactors poi rotation to use degrees instead of dir 2019-03-27 12:57:16 -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
Neerti
1dd3bb4532 Stops initialization from grinding to a halt when loading maps 2019-03-27 01:49:25 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Anewbe
c3574a3a56 Woops I misse dit, removes the forced announce from atom proccall 2019-01-28 22:10:55 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Spades
fcff9205e6 Eliminates vorestation edit 2019-01-13 12:27:21 -05:00
Neerti
e28adbfe75 Makes IC ticket response less rude 2019-01-13 02:27:56 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Spades
fb6f5e33ca Corrected commented code 2019-01-11 22:33:53 -05:00
Spades
096ae8e226 Disables Shadekin smite because no shadekin 2019-01-11 22:32:13 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
ArgobargSoup
a7139093b3 Adds a VStation Edit. 2018-12-04 14:11:00 -08:00
ArgobargSoup
7fea35c246 Fixes a little grammar/spelling error. 2018-12-04 13:57:01 -08:00
ArgobargSoup
d68ba3ae23 Changes IC Issue response to be a bit less snippy. 2018-12-04 13:52:45 -08:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Neerti
8333f3cd0b Merge pull request #5705 from VOREStation/aro-bwoink 
Fix adminhelp sound toggle respect
 2018-10-30 18:38:59 -04:00
Aronai Sieyes
2d6d05acb0 Merge pull request #4429 from VOREStation/upstream-merge-5663 
[MIRROR] More paths to Quick_Create
 2018-10-20 17:37:20 -04:00
Aronai Sieyes
382c6b5152 VS edit merge 2018-10-20 17:28:24 -04:00
Neerti
360103a487 More paths to Quick_Create 2018-10-20 00:05:48 -04:00
Neerti
e46506adf7 Merge pull request #5667 from lbnesquik/Kates-Admin-Tweak² 
Bring back the traitor panel verb.
 2018-10-20 00:05:37 -04:00
Neerti
972777fd94 Adds Mods/Dev perms to ticket permission checks (#5683) 2018-10-16 18:28:14 -04:00
Aronai Sieyes
9dc2f288a0 Clean up two-way merge 2018-10-16 12:08:31 -04:00
Anewbe
6e5a5f5edc Fix a couple of ticket bugs 2018-10-15 15:49:58 -04:00
Arokha Sieyes
164c72267c Vorestation specific tweaks for tickets 2018-10-10 18:17:13 -04:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -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
atermonera
2f9cebd38d Submaps can now be rotated to any cardinal direction (South is default) 2018-08-31 01:32:26 -07:00
atermonera
a20085ccff PoIs can be rotated in increments of 90 degrees 2018-08-30 18:55:22 -07:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Neerti
3b5874d3f1 Weather refactor. 2018-08-11 18:42:36 -04:00
Anewbe
1b57722d22 Fixes spelling of Strike in Lightning Strike admin verb 2018-08-05 14:05:03 -05:00
Neerti
c4cd111083 Adds logging. 2018-07-31 16:30:11 -04:00
Neerti
6bdf355e6d Finishes thunderstorms. 2018-07-31 14:45:26 -04:00