cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-30 20:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,748 Commits 5 Branches 0 Tags
ed525cef2ca92d666d57ecdfd662113dd7fe85ec
Commit Graph

1626 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
Mechoid
b7231dc8cc Don't spawn things in Null please. 2018-09-23 00:24:34 -07:00
Neerti
aec83fd4f2 Merge pull request #5577 from Anewbe/grilles 
Fixes a couple of tool related oversight/runtimes
 2018-09-19 16:08:37 -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
Anewbe
765106986d Fixes a couple of tool related oversight/runtimes 2018-09-18 14:00:43 -05:00
Atermonera
c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob 
More Blob modularity / Event-Manager compatability, Nests.
 2018-09-18 11:11:51 -07:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Spades
1eaa3266ba Merge pull request #4088 from VOREStation/upstream-merge-5446 
[MIRROR] Fireaxe cabinets find their fireaxes in initialize(), rather than new()
 2018-09-10 07:02:36 -04:00
Spades
50c0c7bedf Merge branch 'master' into upstream-merge-5446 2018-09-09 17:58:23 -04:00
Spades
eb94467f39 Merge branch 'master' into upstream-merge-5432 2018-09-09 17:57:31 -04:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Spades
26a227b342 Merge pull request #4065 from VOREStation/upstream-merge-5427 
[MIRROR] Fixes the fireaxe cabinet
 2018-09-07 10:50:27 -04:00
Poojawa
5d0328d0e5 fixes the trailing tag, I think 2018-09-05 21:42:27 -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
6acab6f2bb Merge pull request #5544 from Anewbe/grilles 
Should fix another runtime with tools
 2018-09-02 21:14:02 -07:00
Anewbe
85a754480a Should fix another runtime with tools 2018-08-31 22:14:15 -05:00
Mechoid
69ad0ce12b Cult Girders are back to being proper. 2018-08-30 22:21:21 -07:00
Anewbe
abe2f2c26a Merge pull request #5519 from Mechoid/Mech_Equipment_Carepackage1 
Mech Equipment Carepackage 1: Mainly Weapon Slots
 2018-08-26 12:48:32 -05:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Mechoid
be703cee04 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 2018-08-23 20:17:49 -07:00
Mechoid
509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07: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
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
20602a1818 Cleans up some largecrate code 2018-08-10 21:20:15 -05:00
Atermonera
23c1faac33 Merge pull request #5483 from MisterLayne/inflatable_fix 
Inflatables are damaged properly
 2018-08-08 20:39:23 -07:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07:00
MisterLayne
c6982155bf Become thwarted, thot. 2018-08-07 14:05:48 -04:00
Anewbe
ef131135f0 Corgi rune now summons the corgi in a flash of harmless lightning 2018-08-03 16:58:42 -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
Neerti
6bdf355e6d Finishes thunderstorms. 2018-07-31 14:45:26 -04:00
Neerti
8639d49c34 Begins work on lightning. 2018-07-28 11:08:30 -04:00
Neerti
8faa8c5c9c Fireaxe cabinets find their fireaxes in initialize(), rather than new() 2018-07-27 02:16:58 -04:00
Anewbe
bca0350348 Fireaxe cabinets find their fireaxes in initialize(), rather than new() 2018-07-26 22:42:36 -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
Anewbe
f5312bcedd Refactors supply controller 2018-07-24 11:04:16 -04:00
atermonera
95398466de refactors supply controller 2018-07-22 13:44:44 -07:00
Atermonera
415d632261 Merge pull request #5427 from Anewbe/fireaxe_cabinet 
Fixes the fireaxe cabinet
 2018-07-22 02:11:24 -04:00
Anewbe
705203dc67 Fixes the fireaxe cabinet 2018-07-20 19:06:20 -05:00
Anewbe
a3835d42f4 Merge pull request #5397 from Atermonera/boilerplate_list_fix 
Global list boilerplates cause the target path to actually add to the list
 2018-07-09 22:52:12 -04:00
atermonera
a5eb8954ab new() was missing ..() 2018-07-08 13:48:40 -07:00
Verkister
d1ab58b7f8 Little tweaks etc. 
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
 2018-06-25 11:33:19 +03:00
Verkister
49e7cb1bcd Adds "redspace" oties. 
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
 2018-06-24 16:34:24 +03:00
Mechoid
3c35b7d13a Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 21:42:19 -04:00
Mechoid
313526adb8 Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 20:41:19 -05:00
Aronai Sieyes
a162c86d51 Merge pull request #3855 from VOREStation/upstream-merge-5341 
[MIRROR] Wires are under catwalks, fueltanks are over floor decals
 2018-06-15 08:57:22 -04:00
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810) 
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
 2018-06-11 06:06:49 -04:00
Atermonera
d768871055 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 15:41:54 -04:00