cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-06 06:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,748 Commits 10 Branches 0 Tags
5f3a65e9035e576a4d08977bb35f88635e110c19
Commit Graph

7805 Commits

Author SHA1 Message Date
Repede
5f3a65e903 Merge branch 'self' of https://github.com/Yawn-Wider/YWPolarisVore into self 2018-10-27 20:25:37 -04:00
Repede
f7b9137b75 Removes weldertank explosion memes 2018-10-27 20:20:05 -04:00
Hawk_v3
2cfaf95e78 Merge branch 'upMaster' into updates 2018-10-21 03:48:41 +01:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert 
ERT Equipment Redo
 2018-10-20 17:34:41 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Hawk_v3
d2476e5043 Fixes to minor things around the station, also: 
* Piano outside the bridge.
* RUST and Tesla engines should be more functional. Lightning rods for Tesla, RUST cooling control should now link to the vents and injectors correctly.
* Cargo Sealed Airlock now has access and control setup, should work when the rest of the fixes are made.
* All arrivals points now have emergency wall lockers with crowbars in.
 2018-10-17 22:46:09 +01:00
Hawk-v3
1adf494b74 Merge pull request #1 from Dwaggy/master 
Change Merges
 2018-10-16 22:43:10 +01:00
Hawk_v3
71b8f6582d Merge remote-tracking branch 'upstream/master' 2018-10-16 22:10:17 +01:00
Aronai Sieyes
92209a64f7 Merge pull request #4408 from VOREStation/upstream-merge-5679 
[MIRROR] Makes RCDs Clean Again
 2018-10-16 14:50:40 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Anewbe
9007553a6c Merge pull request #5678 from Neerti/anchored_fix 
Fixes two anchored-related bugs, taped papers and the medbay phone.
 2018-10-16 14:05:10 -04:00
Dwaggy
ffb495a58c Language fix for Akula and Zorren. 
-Hopefully this should fix Akula and Zorrens not been able to speak their own languages. Skrell and Terminus.

-'fixed' the musical instruments only limited to 50. changing all instruments to handle at 400..
 - I would have used the var, but..it didn't cooperate with me, i'm probably been really dumb with it, so did it this way instead, instruments are basiclly all spawned in anyway via admin right now.
 - (if someone wants to tell me how to make it work with the var, i'll do that, but the ways i tried, either errored or the game just ignored. so..*eh?*)
 2018-10-16 18:12:37 +01:00
Hawk_v3
cf91915e46 Merge remote-tracking branch 'upstream/master' 2018-10-16 00:25:28 +01:00
Anewbe
935fb1ed06 Merge pull request #5669 from VOREStation/pol-binocs 
Stop usage of multiple vision modifiers
 2018-10-15 15:51:43 -04:00
Hawk_v3
10ca5bb70f Merge remote-tracking branch 'upstream/master' 2018-10-14 17:09:41 +01:00
Arokha Sieyes
e6bf904252 VS edit 2018-10-13 19:20:13 -04:00
Anewbe
51a493427d Graves (#5622) 
* Adds support for closets storing closets, and graves

* More Grave Things
 2018-10-13 17:58:48 -04:00
Atermonera
eb1bbac042 Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix 
Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
 2018-10-13 17:17:27 -04:00
Unknown
3f4039d027 ERT Equipment Redo 
- Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles
- Adds 5mm Assault Rifles, .45 revolvers
- Reduces the number of powerful weapon types (energy sniper, combat shotgun)
- Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines
- Adds a lot of things to the medical and engineering ERT sections
- Replaces weapon power cells with self-charging weapon power cells
- Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells
- Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section
- Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy
- Adds LMGs to Zulu's armory
 2018-10-10 19:02:48 -04:00
Spades
ea056f6b88 Merge pull request #4316 from VOREStation/upstream-merge-5628 
[MIRROR] Minor issues fix.
 2018-10-08 20:29:08 -04:00
Hawk_v3
c931ceaa1f Merge remote-tracking branch 'upstream/master' 2018-10-07 23:07:09 +01:00
Spades
f379ea2df4 Update weldingtool.dm 2018-10-07 17:55:35 -04:00
Spades
b1b565c352 Update weldingtool.dm 2018-10-07 17:55:01 -04:00
Spades
91a67b6b37 Update weldingtool.dm 2018-10-07 17:54:35 -04:00
Spades
8c2e0928fa Merge pull request #4130 from KasparoVy/fix-tesh-hide-again 
Fix Teshari Hiding Again
 2018-10-06 08:25:35 -04:00
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -04:00
Hawk_v3
4e66b1f7c7 Initial merge fixes 
Clean Compile, 0E, 0W
 2018-10-03 20:08:55 +01:00
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
Anewbe
9498d6f7db Merge pull request #5619 from SpadesNeil/toy-sounds 
Text for handheld plushies when poked
 2018-10-02 14:20:47 -04:00
Spades
4a00acc6d4 Merge pull request #4291 from VOREStation/upstream-merge-5613 
[MIRROR] Custom RIG Framework
 2018-10-01 09:30:24 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018 
Polaris Sync 09-27-2018
 2018-10-01 08:43:03 -04:00
Mechoid
78b173b50a Custom RIG Framework (#5613) 
* Framework for Custom RIG sprites.

* Fixfix
 2018-09-30 17:50:39 -04:00
Spades
9e86743d00 Merge pull request #4163 from Mewchild/MC-Syringes 
Reverts Syringe infections
 2018-09-27 19:38:08 -04:00
Arokha Sieyes
cb43ac69ea Satisfy stupid indentation.awk, which is just wrong. 2018-09-27 18:22:55 -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
Mechoid
b7231dc8cc Don't spawn things in Null please. 2018-09-23 00:24:34 -07:00
Wickedtemp
21878523b1 Adds the Biopsy Scanner to the Surgery Kit (#5589) 
* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.
 2018-09-22 18:53:36 -05:00
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys 
Technically adds the Ore Redemption Machine
 2018-09-22 13:38:10 -07:00
Hawk_v3
35216f5b61 Merge remote-tracking branch 'upstream/master' 2018-09-20 21:41:08 +01:00
Anewbe
6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05: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
Neerti
b17b2f63ce Merge pull request #5578 from Anewbe/cuffs 
Fixes hand and leg cuffs
 2018-09-19 16:08:11 -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
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -05:00
Anewbe
5fb0e06a5a Fixes hand and leg cuffs 2018-09-18 14:32:54 -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
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom 
Vehicle Expansion 1: Zoom Harder
 2018-09-17 11:14:54 -07:00
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -04:00