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
79,149 Commits 8 Branches 0 Tags
f7e9f8d12bddd3183ee87a4e02ff9c5935b51a5c
Commit Graph

1048 Commits

Author SHA1 Message Date
Hawk_v3
2cfaf95e78 Merge branch 'upMaster' into updates 2018-10-21 03:48:41 +01: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
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
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
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
Spades
50c0c7bedf Merge branch 'master' into upstream-merge-5446 2018-09-09 17:58:23 -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
Anewbe
20602a1818 Cleans up some largecrate code 2018-08-10 21:20:15 -05:00
RadiantFlash7
723c3d63be Mapping work+lumber lockers 
Added some structures DMI's to use, adjusted mining+part of xenoarch,
did a lot of work on lower level and maint level, added a few closet
variants for lumberjacks
 2018-08-05 13:21:22 -04: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
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
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
RadiantFlash7
aedd717e53 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-30 17:48:00 -04:00
Hawk_v3
8aa6aa85bc Merge remote-tracking branch 'upstream/master' 2018-06-29 22:32:22 +01:00
Hawk_v3
9a38e88b9f Blueshield updates. New shotgun. 
Semiauto revolver shotgun for Blueshield and Warden. Sprites are placeholder.

Blueshield spawn gear boxes for weapon choice now.
 2018-06-29 15:03:01 +01:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Repede
9155e62b5c Blueshield tweaks and map_template.dm typo fix 2018-06-28 00:23:41 -04:00
RadiantFlash7
064bcba242 Chapel/monastary, Prison, library/cafe partway 
Chapel area and new chaplain pet 'Ignis', Finalized most of the prison,
added a new monastary to be used by the chaplain/monk, and serves as a
public garden for the crew.
Partway done with cafe and library, currently under work.
 2018-06-26 19:11:15 -04: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
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
Repede
4145525a1a Dabs on NIFs, also adds NSFW kit to blueshield locker until we make the custom gun kit 2018-06-23 12:38:20 -04:00
Repede
469f2c7b22 Adds shotgun shells to Blueshield locker 2018-06-14 20:33:54 -04:00
Repede
420c8a2159 Makes blueshield less snowflake 
- fixes title to 'Blueshield Guard'.
 - closet has a shotgun with beanbags instead of a X01 custom fluff weapon.
 2018-06-14 19:54:27 -04:00
Repede
3c07607014 Fixes to map branch to allow blueshield job in 2018-06-13 00:22:19 -04:00
RadiantFlash7
aa90708218 Guitarr, blueshield on tether 
WIP Guitar, Blushield on the tether
 2018-06-11 22:30:34 -04:00
RadiantFlash7
0d74a52ed1 Merge remote-tracking branch 'refs/remotes/Repede/master' 2018-06-11 21:27:21 -04:00
RadiantFlash7
9d46e68742 blueshield, more clothes/vests, more weapons, phorochem fixes, 
Map additions, Phorochem interface fix, some phoreagents fixed, Added
gauss weaponry and blueshield x01, added blueshield role with
uniform/closet.
 2018-06-11 21:27:11 -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
Repede
f772d7622c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-06-10 21:19:07 -04: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
b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 16:23:08 -04:00
Arokha Sieyes
53cb0b70a5 Radiation closet hood fix 2018-06-01 23:52:00 -04:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes
1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00
Arokha Sieyes
8f8c41a7c1 SYNC: Correct vorestation closets/crates to use new system 2018-05-27 19:33:34 -04:00
Arokha Sieyes
2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Atermonera
e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets 
Makes closets/crates like boxes
 2018-05-26 15:24:45 -07:00
Arokha Sieyes
6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.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/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Anewbe
9bc6663930 Crates should always appear below their contents 2018-05-24 17:24:14 -05:00
Arokha Sieyes
f9b409549e Makes closets/crates like boxes 
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
 2018-05-24 17:26:17 -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