cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,827 Commits 8 Branches 0 Tags
f04aeac6ca67b6e4e35d1cf14ca0596bb9ee63d2
Commit Graph

942 Commits

Author SHA1 Message Date
Aronai Sieyes
c39a91eae1 Merge pull request #3325 from VOREStation/Cameron653-patch-1 
Removes excavation drill since it's been ported upstream
 2018-04-08 20:41:11 -04:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Cameron653
8c248d9c5c Removes excavation drill 2018-03-22 15:23:16 -04:00
Cameron653
59844c5553 Xenoarch Multitool & Xenoarch Excavation Drill (#5058) 
* Xenoarch Multitool & Xenoarch Excavation Drill

* Makes the tool work better

* Cuts down on lines & left comments

* change to m
 2018-03-22 09:50:50 -07:00
Arokha Sieyes
8edfdca9ac Remove design_vr for ear translator as it's a stock polaris one now 2018-03-04 13:59:08 -05:00
Arokha Sieyes
68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
Anewbe
524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Anewbe
dfdafddaa9 Merge pull request #4897 from VOREStation/pol-analfix 
Fix health analyzer names
 2018-02-21 10:03:09 -06:00
Arokha Sieyes
3fdafb7194 Rename medical scanners and update map 2018-02-20 19:25:31 -05:00
Arokha Sieyes
3a34ee51c6 Fix name of design for analyzer 2018-02-20 15:06:55 -05:00
Leshana
782e637497 Destructive Analyzer shouldn't delete its own circuit board when analyzing. 
- The deletion of the circuit board without clearing the circuit variable caused it to be hard-deled by SSgarbage after several minutes. After that point, use of RPD or attempt to deconstruct would runtime.
 2018-02-20 00:36:45 -05:00
Leshana
d5131fc4bf Fixes #3518 - Runtime in circuit imprinter deconstruction. 2018-02-20 00:02:42 -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
Mechoid
2723e5d336 Higher-tier Mech-Equip Tweak (#4765) 2018-02-10 00:16:15 -06:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-05 15:50:13 -05:00
mistyLuminescence
da4bd82a5d Adds more med gear to R&D and Cargo (#4691) 
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
 2018-02-04 22:18:36 -06:00
Arokha Sieyes
d0fc288df8 Removes several ways to know every language 
Removes translators from loadout (departments still have them spawn for dealing with their work), removes EAL implant from loadout, remove omni language implant from R&D.

(Also fixes bug with soulcatchers that keeps the brains from hearing borgs, so you can still know all the languages while in a soulcatcher. So if you want to understand everything, get a translator in your head :p)
 2018-02-04 13:03:49 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-03 01:00:57 -05:00
Aronai Sieyes
30d93f99ca Merge pull request #2860 from VOREStation/polaris-sync-2018-01-27 
Polaris Sync 2018-01-27
 2018-01-28 14:08:14 -05: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
Arokha Sieyes
0b6e70402c STEALTH NERFSZZZZ - Removes rigs 2018-01-27 21:28:21 -05:00
Leshana
01925e9de2 Add circuit and research design to allow constructing breaker boxes in game. 2018-01-21 20:36:44 -05:00
Verkister
da7576451f Fixes prosthetic fabricator not printing our base colors on limbs. 
-Lifelike torsos used to get our species base color applied because they were spawned as mobs with the base color being in the human set species proc.
-Made the prosfab look up and apply those base colors on mobless limbs as well.
 2018-01-20 11:35:36 +02:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Mechoid
2145b0371c Allows circuit printers, protolathes, mech fabricators, and prosthetic fabricators to store and use plastic and osmium sheets. No blueprints currently use either, however. 2018-01-08 21:25:52 -08:00
Arokha Sieyes
db0b269699 Add rare materials requirements 
So it doesn't entirely replace surgery
 2018-01-08 18:01:26 -05:00
Arokha Sieyes
ea6ecca731 Advanced NIF Repair Tool 
Creatable at the protolathe. Requires the same tech levels as the NIF, but no exotic materials.

It's a device that accepts nanopaste, and programs the nanite swarms into NIF repair swarms, which are a liquid reagent ingame. It has a 60u storage capacity, and needs to be emptied into any container.
From there, it can be injected via syringe, made into pills, or drank (though the latter two reduce effectiveness by 50%). Each unit nanopaste makes 15u repair nanites, so a full repair from 0% to 100% of a normal NIF requires 7 nanopaste converted to reagents (100u).
 2018-01-08 17:14:56 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Belsima
ff35fe9f56 Adds the disabled mech tools. (#4445) 
* Adds the disabled mech tools.
 2017-12-29 21:44:04 -08:00
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2017-12-26 23:07:58 -05:00
Woodratt
ed9395e58f SC Stupid Sized Map Update 
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
 2017-12-24 07:04:34 -08:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
MisterLayne
05954a278a K. 2017-12-06 16:14:55 -05:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326) 
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
 2017-12-03 17:36:51 -06:00
Neerti
8fedfa205f Merge pull request #4357 from Cyantime/communicator 
Allows communicators to be made by RnD, shows ghosts communicator IMs
 2017-11-27 20:19:59 -05:00
mistyLuminescence
e4ff301c01 Advanced Roller Bed (#4319) 
* Adds the advanced rollerbed to R&D

* default surgery rate

* finally
 2017-11-27 16:40:52 -06:00
Cyantime
209b354fd4 Allows communicators to be made by RnD, shows ghosts communicator IMs 2017-11-27 00:33:49 -05:00
Anewbe
0da9a42517 Adjusts ProsFab and MechFab design menus 2017-11-19 04:25:36 -06:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Anewbe
966749b5f4 Merge pull request #4168 from Neerti/10/27/2017_lag_fix 
Proto/Autolathe lag fix
 2017-10-28 02:13:12 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Neerti
e935df9702 Proto/Autolathe lag fix 
Makes the two machines concatenate a lot less and not make BYOND's super secret string tree cry, hopefully.
 2017-10-27 04:00:44 -04:00
MisterLayne
436eaa1efb Adds language module. 2017-10-26 15:43:25 -04:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103) 
* A whole load of things.

* Fixes the SM Rod's travel distance.
 2017-10-19 15:07:52 -05:00
Anewbe
4a6cf66183 Merge pull request #4087 from Mechoid/Efficient_Me_Fabricators 
Fixes SCIENCE-fabs, Changes Mech-fab Sprite.
 2017-10-16 23:01:43 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX 
BYOND 512 Compiling Errors Fix
 2017-10-16 18:47:47 -04:00
Mechoid
b43201aa79 Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master. 2017-10-16 13:12:08 -07:00