cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,909 Commits 5 Branches 0 Tags
300d9086e2b2d96e609187b03fc6f9c3a07c397a
Commit Graph

504 Commits

Author SHA1 Message Date
Hawk_v3
300d9086e2 Merge remote-tracking branch 'upstream/master' 2018-12-09 19:45:43 +00:00
Spades
fe30b9a61d Merge pull request #4409 from Novacat/nova-pathfinder 
Shelter Capsule Content Tweaks
 2018-12-08 09:42:18 -05:00
Hawk_v3
eac48b5283 Merge remote-tracking branch 'upstream/master' 2018-10-24 22:07:16 +01:00
Unknown
e3889b60cb Moved everything into mapfile 2018-10-24 00:03:24 -04:00
Unknown
c674f13de4 Nerfs Cash from Mining Vendor 
The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table.
 2018-10-20 14:50:43 -04:00
Unknown
3a510e9779 Tweaks contents a bit more 2018-10-16 22:19:46 -04:00
Unknown
6dc9e56a44 Shelter Capsule Content Tweaks 
- Adds some more synth batteries to both capsules
- Removed the Adv first aid kit from the table
- Adds a Basic/Adv/O2/Fire/Toxin kit to luxury storage
- Removes the violin due to being a source of grief
- Changes the bag of dice to a bag of gaming dice
- Luxury capsule now has twice the amount of MREs

The main reasons for this PR:
- Removes shelter capsules as a source of violins, which have been involved in a few... incidents
- Equals the amount of batteries to the amount of liquid foods in the basic capsule, so that synth crew are not required to push for the luxury capsule and its recharger
- Adds a toxin kit to shelter capsules, since toxins are a bigger issue in the phoron-based atmosphere of V2
- Provides a health analyzer to the shelter capsule, the omission of which was very strange.

Rest of the kits were added just for completion sake. All of the ones included be obtained from cargo for a single ten point crate, so the effects on balance will be minimal.
 2018-10-16 17:27:35 -04:00
Hawk_v3
71b8f6582d Merge remote-tracking branch 'upstream/master' 2018-10-16 22:10:17 +01:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Aronai Sieyes
d66c8e326b Merge pull request #4394 from VOREStation/upstream-merge-5652 
[MIRROR] Fixes missing sprites when excavating rocks
 2018-10-16 12:18:35 -04:00
Anewbe
6bf9647ff7 Merge pull request #5652 from Cerebulon/excavation_sprite 
Fixes missing sprites when excavating rocks
 2018-10-15 15:48:42 -04:00
Anewbe
8fc3cdfb3e Merge pull request #5647 from lbnesquik/Kates-Mining-Tweak 
Add a noise for mining scanners.
 2018-10-15 15:48:30 -04:00
Hawk_v3
10ca5bb70f Merge remote-tracking branch 'upstream/master' 2018-10-14 17:09:41 +01:00
Anewbe
f0db332943 Remplace sprite hammer with pickaxe 2018-10-09 16:28:45 -04:00
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
Mechoid
37342fc2d6 Adds a generic proc to the mining vendor to add custom / blank entries. 2018-09-23 02:21:54 -07:00
Anewbe
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -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
Mechoid
509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07: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
Atermonera
f5fb89cb3d Merge pull request #5421 from Anewbe/IWouldLikeWallsToLookNiceNowPlease 
Mining turfs maybe probably possibly look nice all the time now I hope?
 2018-07-20 21:45:56 -04:00
Anewbe
5d13328a94 Mining turfs maybe probably possibly look nice all the time now I hope? 2018-07-18 22:20:45 -05: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
Anewbe
71fe7798f6 Ports Fulton Balloons (#5354) 2018-06-21 00:20:11 -07:00
Atermonera
aca81ab59c Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 15:42:55 -04:00
Anewbe
7d23980df4 Mining turf overlays should be properly placed now 2018-06-06 18:09:07 -05:00
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.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
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04:00
Anewbe
65051fe83b Rewrite mine turf overlay adding 2018-05-29 14:35:45 -04:00
Arokha Sieyes
3827307e59 Rewrite mine turf overlay adding 
Stop adding overlays on adjacent turfs. Just add them on yourself, and push them sideways.
 2018-05-27 16:27:02 -04:00
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-05-23 00:13:07 -04:00
Arokha Sieyes
cb0f107526 Set a fake ID on shelter buttons to avoid messing with every door 2018-05-18 10:14:27 -04:00
Arokha Sieyes
58189980d2 Shelters: forgot this file 2018-05-14 22:51:11 -04:00
Arokha Sieyes
46f6121624 Capsule shelter QOL 
Bolts/opacity button, roofs for multiz areas
 2018-05-14 22:31:09 -04:00
Heroman3003
aa421e4951 Fixed shelter table being a frame reskin 2018-05-14 11:33:01 +10:00
Repede
9e69f25327 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
 2018-05-13 21:08:22 -04:00
Arokha Sieyes
4ce3f055b5 Fix underdark mob spawn areas again again again 2018-05-04 22:18:03 -04:00
Arokha Sieyes
edec960bda Shelter sleeper description tweak 2018-04-29 21:03:29 -04:00
Repede
372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
 2018-04-27 21:45:13 -04:00
Leshana
a8074330f7 POLARIS: Cleanup mineral processing unit 
Convert those spawn() in New() to use initialize() instead.
Convert hard coded state numbers to use define constants.
 2018-04-27 09:50:38 -04:00
Arokha Sieyes
d19e68ba55 No more portable GPS console 2018-04-25 22:16:13 -04:00
Leshana
c09412c33e Implements the Mining Equipment Vendor 
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
 2018-04-24 18:18:54 -04:00
Arokha Sieyes
fa7ec1f488 Ports /tg/ fulton system 2018-04-24 12:59:26 -04:00
Leshana
051384ee22 Adds the Resonator 
A device which sets up resonating energy fields which collapse, mining mineral turfs and/or doing damage to any mobs standing inside.  Does no damage to anything else, and damage to mobs is only high when used in low temperature environment (such as... outside or in space)
Uses quite a few dmis, for the icons, in hand icon, and effect icons.  Includes sound effects
Ported from tg and Paradise
 2018-04-24 12:57:50 -04:00
Leshana
5c6d6a5d20 POLARIS: Cleanup mineral processing unit 
Convert those spawn() in New() to use initialize() instead.
Convert hard coded state numbers to use define constants.
 2018-04-24 12:57:49 -04:00
Arokha Sieyes
cd865a176b Fix a table sprite and a shelter window layer 2018-04-23 15:44:13 -04:00