cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-08 00:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,748 Commits 8 Branches 0 Tags
ed525cef2ca92d666d57ecdfd662113dd7fe85ec
Commit Graph

1281 Commits

Author SHA1 Message Date
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
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic 
Ports /vg/ instrument frame work, adds client based sound pref toggle.
 2018-09-19 15:04:06 -05:00
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -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
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref 
Also shifts sound files which is 98% of the bulk here.
 2018-09-05 03:35:34 -05:00
atermonera
24c4c6dd9f Ready for merge 2018-09-02 14:16:00 -07:00
Atermonera
347c97326a Appeases travis (Round 2) 2018-08-26 18:00:51 -07:00
Atermonera
0ce768af5a Appeases travis (Round 1) 2018-08-26 17:43:52 -07:00
Atermonera
22d9c89a97 Merc blast door controller 2018-08-26 17:08:46 -07:00
Atermonera
63473cb903 Status display access 2018-08-26 17:08:46 -07:00
Atermonera
11d46f1d8c Supply cartridge 2018-08-26 17:08:46 -07:00
atermonera
1f2c7cd9f6 Reorganize GPS to proper organization, important comments 2018-08-26 17:08:32 -07:00
atermonera
96d24e7427 GPS cartridge 2018-08-26 17:08:32 -07:00
atermonera
da45a40fad Refactor crew manifest to a separate file 2018-08-26 17:08:31 -07:00
atermonera
849a3cba56 Cartridge work: part 2 
* Power monitoring console
 * Cartridges have persistent, internal data
 * Code to load element-specific data upon request, instead of serving all relevant data at once
 * Janitorial Supply Locator
 2018-08-26 17:08:02 -07:00
atermonera
cce2201dd7 Cartridge work part 1 2018-08-26 17:08:02 -07:00
atermonera
84458be631 Med records, Sec records, Emp records 2018-08-26 17:07:39 -07:00
atermonera
32bca3d9b6 Template progress 2018-08-26 17:07:38 -07:00
atermonera
5cdeab7208 Cartridge devices 2018-08-26 17:06:53 -07:00
atermonera
3f6ec3e329 Adds newscast viewing, manifest 2018-08-26 17:06:15 -07:00
atermonera
1c8b408594 Initial Work: Manifest, Newsfeed 2018-08-26 17:06:14 -07:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Zap-zapper
b0a0a1e276 Protection from impersonation. Updated to 3700 2018-08-22 17:47:11 +07:00
Zap-zapper
02b58fdb99 Ghosts which joined soulcatcher can't be downloaded in Sleevemate 2018-08-20 23:45:17 +07:00
Spades
16f5ea792b Merge pull request #4091 from VOREStation/upstream-merge-5444 
[MIRROR] Adds the Gigaphone, a suped-up Megaphone.
 2018-08-17 16:13:10 -04: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
eba2257195 Corrects noted issues 2018-08-06 13:15:18 -05:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Neerti
6ffd299fd7 Merge pull request #5461 from Atermonera/supply_nanoUI 
Refactors supply controller
 2018-08-04 02:55:15 -04:00
Zap-zapper
4bed6248b5 Sleevemate tweak. Now can load minds from soulcatchers, and into bodies without mind. 2018-08-03 23:14:37 +07:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
atermonera
ef6c5abf15 Refactors supply controller. 
Supply consoles now run nanoUI
 2018-07-31 19:11:02 -07:00
Mechoid
0f56e2453a Mechoid makes mistakes. Fix telepathic gigaphones. 2018-07-30 12:58:41 -07:00
Anewbe
6c6c5a2255 Merge pull request #5444 from Mechoid/Gigglephone 
Adds the Gigaphone, a suped-up Megaphone.
 2018-07-27 19:28:36 -04:00
Anewbe
839fb2a33e Merge pull request #5444 from Mechoid/Gigglephone 
Adds the Gigaphone, a suped-up Megaphone.
 2018-07-27 18:27:57 -05:00
Anewbe
975b5a7bf2 Merge pull request #5441 from Mechoid/Halogenscannerreeee 
Fixes the PDA Halogen Scanner's tendency to be number one.
 2018-07-26 15:14:18 -04:00
Mechoid
95f7a46979 Adds the Gigaphone, a suped-up Megaphone. 2018-07-26 00:13:11 -07:00
Mechoid
1e5a0750f9 Fixes the PDA Halogen Scanner's tendency to be number one. 2018-07-25 17:04:41 -07:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Atermonera
32557da8f2 Merge pull request #5356 from Anewbe/recharger_refactor 
Recharger refactor
 2018-06-16 14:15:15 -07:00
Aronai Sieyes
c6fae09c1d Merge pull request #3888 from VOREStation/upstream-merge-5322 
[MIRROR] Move planets to SSplanets
 2018-06-16 13:57:09 -04:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 20:15:03 -04:00
Mechoid
4cd51ff79f Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 19:14:16 -05:00
Anewbe
98b3af60fa Move planets to SSplanets 2018-06-15 19:05:38 -04:00
Anewbe
9e28740697 Merge pull request #5322 from VOREStation/pol-planetstart 
Move planets to SSplanets
 2018-06-15 18:05:25 -05:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
Arokha Sieyes
462effc1d2 Creates SSplanets subsystem 
For SPEEDYNESS

It probably works. I mean it's hard to sit there for 8 hours and test it. But it seems to work okay. At worst if it doesn't you'll have weather that doesn't make sense. ;v
 2018-06-02 19:09:35 -04:00