cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,089 Commits 8 Branches 26 Tags
9c4365f700b79052d21488ca9d67b77ba2c19441
Commit Graph

669 Commits

Author SHA1 Message Date
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
5ca397fb43 Merge pull request #4830 from VOREStation/upstream-merge-5960 
[MIRROR] Reverts some real spacebrain gas
 2019-03-28 21:29:55 -04:00
Novacat
354a6b501b Update turf_changing.dm 2019-03-28 21:13:59 -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
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
54b1d524ea Conflict Resolution 2019-03-27 12:19:15 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -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
Neerti
60c9cc6e01 Reverts some real spacebrain gas 2019-03-04 21:38:53 -05:00
Unknown
16d599c05a [AI BRANCH] Attempt to fix Active Edge 2019-02-16 23:46:26 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Aronai Sieyes
07377724e2 VS Changes to unsimulated.dm 2018-10-16 14:42:54 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -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
8b7fbbe98c Merge branch 'master' into upstream-merge-5424 2018-09-01 18:40:37 -04:00
Spades
9e77d6a16f Update floor_attackby.dm 2018-09-01 18:38:23 -04:00
Spades
301ef7cc55 Update wall_attacks.dm 2018-09-01 18:37:55 -04:00
Spades
07a8c29bcd Just update the whole file 2018-09-01 18:37:30 -04:00
Spades
815ccfe308 Update turf_changing.dm 
How the fuck did this get merged here
 2018-09-01 18:36:33 -04:00
Mechoid
69ad0ce12b Cult Girders are back to being proper. 2018-08-30 22:21:21 -07:00
Anewbe
09ca735731 Might help with air subsystem lag 2018-08-28 18:50:04 -05:00
Spades
887899f50b Merge pull request #4082 from VOREStation/upstream-merge-5439 
[MIRROR] Fixes layering issues for a few things
 2018-08-17 16:12:12 -04:00
Spades
4c001b1e2a Merge pull request #4072 from VOREStation/upstream-merge-5431 
[MIRROR] Fixes RCD runtime
 2018-08-17 16:11:19 -04:00
Spades
967f42b682 Merge pull request #4056 from VOREStation/upstream-merge-5420 
[MIRROR] Fixes Indoor Weather
 2018-08-17 16:05:04 -04:00
Spades
db804f02ee Merge pull request #4061 from VOREStation/upstream-merge-5423 
[MIRROR] Implements ways to make floors not get dirty
 2018-08-16 05:44:19 -04:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07:00
Atermonera
db16e11e3e Merge pull request #5474 from Anewbe/open_space 
MultiZ falling tweaks
 2018-08-06 15:38:21 -07:00
Anewbe
a13783945f MultiZ falling tweaks 2018-08-04 23:32:04 -05:00
Anewbe
73a3417f5d Various things and floors no longer associate with dirt 2018-08-04 22:41:58 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05: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
Anewbe
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Neerti
066975bad0 Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator. 2018-07-24 13:30:09 -04:00
Aronai Sieyes
4bfb0e163c Merge branch 'master' into upstream-merge-5420 2018-07-23 12:22:39 -04:00
Aronai Sieyes
b3301e57a0 Update floor_attackby.dm 2018-07-23 12:21:50 -04:00
Aronai Sieyes
5491378104 Update wall_attacks.dm 2018-07-23 12:21:28 -04:00
Anewbe
cdf4faede3 Merge pull request #5431 from Neerti/rcd_space_fix 
Fixes RCD runtime
 2018-07-23 11:08:46 -04:00
Neerti
f1f08b9332 Fixes RCD runtime. 2018-07-22 04:21:54 -04:00
Aronai Sieyes
1e2d27e8c4 Merge pull request #4035 from VOREStation/upstream-merge-5409 
[MIRROR] Adds roofing tiles
 2018-07-21 14:44:09 -04:00
Atermonera
0a83f95c92 Merge pull request #5423 from Anewbe/dirt_floors 
Implements ways to make floors not get dirty
 2018-07-20 21:48:11 -04:00
Atermonera
b6f654b277 Merge pull request #5423 from Anewbe/dirt_floors 
Implements ways to make floors not get dirty
 2018-07-20 18:47:15 -07: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
56c9db18e0 Implements ways to make floors not get dirty 2018-07-19 17:21:39 -05:00
Anewbe
2750a9f78f Fixes Indoor Weather 2018-07-18 15:21:12 -04:00