cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 18:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

109 Commits

Author SHA1 Message Date
Aaron
ff9ec4943b New Mech "Scarab"! Plus a bunch of mech fixes 
Adds a new mech the "Scarab"! A fast scout mech with terrible armor and health and equipment slots, but it's fast! Ideal for enter a conflict, scouting, maybe taking a pot shot and and then BUGGERING off.
Bug fixes:
-Fixes Polecat armor to plasteel exploit and makes the polecat actually use up the armor.
-Fixes the Serenity eating entire stacks of plasteel and giving gygax armor plates when you try to get it back.
-Fixes the Phoron bore to HOPEFULLY show up in the mechfab in the server.
 2020-01-20 19:51:24 -05:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Sharkmare
f568be89d9 The cake, Serg event. (#120) 
Adds items for an event, Made by Shadowfire117 and Ketrai
 2020-01-11 00:20:57 +01:00
Shadow
0d8ab20599 A Slash! 2019-12-16 16:11:28 -06:00
Shadow
71b7b93c21 untested™️ 2019-12-15 17:06:43 -06:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Novacat
d5b416f70b Merge pull request #5542 from VOREStation/upstream-merge-6328 
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
 2019-07-31 02:10:06 -04:00
Atermonera
35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208) 
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
 2019-06-21 00:14:05 -04:00
mistyLuminescence
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers 
Precurso / Anomalotech Sleepers
 2019-04-14 01:16:46 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Novacat
4801fe8c8e Merge pull request #4860 from Heroman3003/id-restorer 
Added ID restoration terminal
 2019-03-28 22:03:17 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Heroman
867eac413a Adds unique icon for ID restorer (courtesy of VerySoft) 2019-03-28 15:56:47 +10:00
Heroman3003
ca16b830b1 Added ID restoration terminal near HoP's office 2019-03-20 10:41:36 +10: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
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -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
Leshana
a1bfd1fb46 Make gas turbine constructable and operational 
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
 2018-02-22 15:43:38 -05:00
Aronai Sieyes
94cdc508bc Merge pull request #3068 from VOREStation/vplk-timeclock-i 
Adds Timeclock Terminals: A machine for viewing your PTO balance.
 2018-02-22 12:27:09 -05:00
Leshana
805b7f7b78 Make gas turbine constructable and operational 
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
 2018-02-18 21:21:50 -05:00
Leshana
31b8e30aac Adds Timeclock Terminals: A machine for viewing your PTO balance. 
* Timeclock machine and NanoUI template.
* Circuit board for construction.
* Frame datum for construction on walls.
* Sprites by VerySoft
 2018-02-18 20:42:22 -05:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Cyantime
a2f3443828 SMES tweaks (#4793) 
* SMES tweaks

* Replace some fireloss with electrocute_act
 2018-02-12 20:39:58 -06:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	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-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
 2018-01-27 23:08:53 -05:00
Leshana
01925e9de2 Add circuit and research design to allow constructing breaker boxes in game. 2018-01-21 20:36:44 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
 2018-01-09 14:40:09 -05:00
Leshana
224fe42e77 Prepare Atmospherics Machinery for SSatoms (#4501) 
* to_chat() replacement.

* Revert calling target.init_dir() before connecting.

* This change was added in https://github.com/PolarisSS13/Polaris/pull/3775 to counteract `dir` not being set prior to New() for dynamically loaded maps.  The root cause was /atom/New() not calling _preloader.load().  Undoing the change now that /atom/New() is fixed.
* The addition of the init_dir() proc itself however, is useful, because there ARE other times some atmos machinery will want to re-initialize its dir, specifically whenever it is rotated.
* init_dir() must be called in the constructor of all atmospherics machines capable of connecting to another.   Since it has to happen for ALL machines, lets move that call to /obj/machinery/atmospherics/New()

* Rename /obj/machinery/atmospherics initialize() to atmos_init()

* These days `initialize()` is used to handle general object initialization that is moved outside of New().  The node connection discovery of atmos machinery needs to happen after all that, and so needs to be in a separate proc.
* Make sure to actually call atmos_init during system startup.
 2018-01-06 10:52:56 -06:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Cyantime
9ba6d5759a Fixes 'reques console' 2017-11-22 18:25:49 -05:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Anewbe
fce9fe2c72 Merge pull request #4188 from Atermonera/VR_2 
Virtual Reality
 2017-11-03 15:10:53 -05:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
Cyantime
36e78b48f1 Adds plasma research outpost. 2017-09-29 02:28:43 -04:00
Cyantime
49a62057c3 Constructability. 2017-09-15 21:52:35 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
99eb6f9404 Updates Tools 
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
 2017-08-03 04:49:23 -04:00
Leshana
12bc03157a Adds the Algae Oxygen Generator 
* This device converts CO2 to O2 using power and "algae".  The extra carbon is a byproduct in the form of "graphite"
* This is intended for virgo3b, which has no oxygen in its atmosphere but enough CO2 for us to just extract it.
 2017-05-03 01:54:55 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
 2017-04-01 19:19:42 -04:00
Leshana
ab4c63791a Modernize the automatic pipe layer 
* Upgrades the automatic pipe layer to modernize its code a bit towards latest standards and fixing various bugs.
* Make it constructable so it can acutally be used by someone!
 2017-03-30 18:13:37 -04:00
Cerebulon
55fd0a2041 Adds hand sprites to many items in the engineering department 2017-03-29 04:09:33 +01:00
Leshana
476b85a489 Merges VOREStation jukebox into standard jukebox 
Fixes #1184 by simply eliminating the "/vore" sub-type of jukebox.  Now that upstream jukebox has all of our hacking capabilities, we only need to sideways override New to update the songs list.
 2017-03-20 18:31:55 -04:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00