cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,646 Commits 5 Branches 0 Tags
d2476e5043737beaa8c77a655e137e87e46587ca
Commit Graph

942 Commits

Author SHA1 Message Date
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01: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
Hawk_v3
fec9817c54 Moving robot icons around, and merging. 
Any robot icons in robots_vr.dmi should work automagically if I'm reading vore's robot icon code right. Let's try it.
 2018-09-12 23:34:20 +01: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
Hawk_v3
317039b60e Merge remote-tracking branch 'upstream/master' 2018-08-21 21:01:43 +01: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
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
 2018-08-17 19:13:15 -04: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
Atermonera
9c081d5cc7 Merge pull request #5466 from Woodratt/08022018_HolomapPort 
Holomap Port
 2018-08-03 17:06:37 -07:00
Woodratt
cd20465d38 Holomap Port 
- Port of Holomaps from Virgo
 2018-08-02 15:52:56 -07:00
atermonera
ef6c5abf15 Refactors supply controller. 
Supply consoles now run nanoUI
 2018-07-31 19:11:02 -07:00
Neerti
8639d49c34 Begins work on lightning. 2018-07-28 11:08:30 -04:00
Anewbe
f5312bcedd Refactors supply controller 2018-07-24 11:04:16 -04:00
Aronai Sieyes
4bfb0e163c Merge branch 'master' into upstream-merge-5420 2018-07-23 12:22:39 -04:00
atermonera
95398466de refactors supply controller 2018-07-22 13:44:44 -07:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Anewbe
928fbe5ac8 Fixes indoor weather, hopefully for real this time. 2018-07-20 19:08:42 -04:00
Neerti
bca4277e4f Fixes indoor weather, hopefully for real this time. 2018-07-19 20:25:05 -04:00
Anewbe
2750a9f78f Fixes Indoor Weather 2018-07-18 15:21:12 -04:00
Neerti
d3754f8bfc Attempts to fix indoor rain. 2018-07-17 21:30:02 -04:00
gozulio
7d6baf75bf More fixes for initializing Atmos Machines by the engine loader. 
Engine loader now calls build_network() on machines and machine nodes.
Added Cleaned up and added comments to document engine select console code.
 2018-07-12 17:37:55 -04:00
Michael Gosselin
edee640268 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-07-09 19:02:57 -04:00
Michael Gosselin
23848dd246 Patch for not initialising Atmos properly. 
Engine loader now calls a proc to init Atmos machinery after loading the
submap.
Use time helper library to hopefully bring the engine select timer in
line.
 2018-07-09 18:33:28 -04:00
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -04:00
Anewbe
f0a7b2466e Merge pull request #5390 from VOREStation/pol-planetstartup 
Fixes some planets controller runtimes
 2018-07-05 15:50:15 -04:00
Arokha Sieyes
434950bbcc Fixes some planets controller runtimes 
Comes up if you use outdoor turfs in places other than planet z-levels
 2018-07-04 21:58:22 -04:00
Michael Gosselin
6e31645b50 Engine spawner fixes. 
Engine spanwer now waits 30 seconds before spawning the engine.
Engine spawner no tells people when it's going to spawn an engine.
Engine spawner alerts the rest of the station to what engine was
selected.
Engine spawner no longer outright players or observers, it gibs them
instead.
Minor streamlining of some code bits.
 2018-06-28 20:50:50 -04:00
Repede
c611d6f5b4 removes useless var in mapping_yw.dm 2018-06-27 21:09:11 -04:00
Michael Gosselin
e34737d9e6 Engine Building Console 
Adds ans engine select console that let's players select what engine
they want, provided they do it in 15 minutes or so
 2018-06-26 20:49:37 -04:00
Michael Gosselin
a47cf6841a Ground work for Player picked engines. 
Lays down the ground work for players being able to select the engine at
the start of the round.
Proof of Concept using a pickEngine() proc that can be called from the
mapping controller.
 2018-06-26 02:18:42 -04:00
Repede
8ea0e21fc6 Merge branch 'master' of https://github.com/Repede/YawnWiderStation into self 
# Conflicts:
#	icons/mob/robots.dmi
 2018-06-23 17:58:41 -04:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
Hawk_v3
195f27e7b7 Remove Host Quickfix 2018-06-23 19:59:41 +01:00
Hawk_v3
d1691eb17c Commenting for clarity 2018-06-23 19:52:01 +01:00
Hawk_v3
6ef41abf91 For Quil and for style 2018-06-23 19:49:01 +01:00
Hawk_v3
d78b59b5b4 Transcore/NIF fix. 
NIFs now have a flag, savetofile, which is set TRUE if durability is changed. It is set FALSE by Transcore saving them. This should stop the lag of many file saves.
 2018-06-23 19:36:21 +01:00
Repede
4145525a1a Dabs on NIFs, also adds NSFW kit to blueshield locker until we make the custom gun kit 2018-06-23 12:38:20 -04: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
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
Repede
93cab07a5a Fixes autotransfer message 2018-06-04 23:26:12 -04: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