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
50,647 Commits 5 Branches 0 Tags
c11c37514c52a25efabc9c5f3a973be40179a2c5
Commit Graph

1998 Commits

Author SHA1 Message Date
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Unknown
8fbd5a5d0a Adds Door Pry, to Ace's specifications 2018-11-24 16:23:17 -05:00
Hawk_v3
2cfaf95e78 Merge branch 'upMaster' into updates 2018-10-21 03:48:41 +01:00
Aronai Sieyes
d6cdba16c8 Merge pull request #4432 from VOREStation/upstream-merge-5685 
[MIRROR] Fix for Viewing Newly Made Records
 2018-10-20 17:37:34 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00
Neerti
e019d0c8ef Fixes new record bug. (#5685) 2018-10-20 03:36:16 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10: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
Unknown
50f0102186 Exploration Fixes for 09-27-2018 Sync 
- Removes redundant station_vr file
- Reverts exploration suit cyclers to polaris cyclers
- Adds a pilot suit cycler to exploration
- Applies a functioning fix for holdout phasers
- Slightly buffs up the holdout phaser to be 50% of expedition phaser, to keep size-effectiveness scaling
- Removes head access from expedition shuttle control console
- Removes Pilot Blue/Old Exploration from polaris cyclers (they are still WIP on polaris end)
 2018-10-09 13:23:14 -04:00
Hawk_v3
c931ceaa1f Merge remote-tracking branch 'upstream/master' 2018-10-07 23:07:09 +01:00
Unknown
af4afc3e32 Fixes bug with holdout phasers 2018-10-05 02:04:30 -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
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
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom 
Vehicle Expansion 1: Zoom Harder
 2018-09-17 11:14:54 -07:00
Neerti
3c4bb873eb Fixes Lead Walls (#5562) 
A material's ``radiation_resistance`` was never considered for calculating a wall's cached resistance to radiation. This fixes it. There is another issue involving r-walls not being better at stopping radiation than their normal-wall counterparts made of the same material but fixing that involves a lot of number adjusting to avoid the SM engine from getting twice as protective.
 2018-09-12 18:47:27 -07: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
3c8313650f Might fix the server startup error_handler runtime 2018-08-30 22:59:15 -05:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Atermonera
1cfefcf2ec Merge pull request #5501 from Anewbe/magazine_things 
Adds smart magazine, magazine functionality
 2018-08-24 14:35:55 -07:00
Anewbe
ee48151135 Adds smart magazine, magazine functionality 2018-08-21 17:10:40 -05:00
Repede
ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.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
#	config/custom_items.txt
#	config/jobwhitelist.txt
 2018-08-17 19:13:15 -04:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
5c35b9f284 Forces mech construction to work with the is_tool() procs 2018-08-04 20:42:53 -05:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -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
ef6c5abf15 Refactors supply controller. 
Supply consoles now run nanoUI
 2018-07-31 19:11:02 -07:00
Anewbe
cdf4faede3 Merge pull request #5431 from Neerti/rcd_space_fix 
Fixes RCD runtime
 2018-07-23 11:08:46 -04:00
Neerti
f1f08b9332 Fixes RCD runtime. 2018-07-22 04:21:54 -04:00
Atermonera
5ce99af730 Hides syndi-synths from the manifest (#5411) 
* Manifest doesn't show the same stationbound cyborgs and AIs that the upload consoles don't show

* Manifest doesn't show borgs with scrambedcodes set
 2018-07-15 13:27:47 -04:00
Atermonera
6a6f4aeafb Hides syndi-synths from the manifest (#5411) 
* Manifest doesn't show the same stationbound cyborgs and AIs that the upload consoles don't show

* Manifest doesn't show borgs with scrambedcodes set
 2018-07-15 12:26:36 -05:00
Dwaggy
0dc547f976 Update: 
Blueshields:
 - Added blueshield headset
   -Has access to Command and Security channels
    -Has its own Encryption key set for blue-shields for this, this stops any accusations of keys been stolen from Sec.
Weapons:
 - This affects BSG and HoS, but the case the NSFW weapon comes in (HoS version), Will have two ammo mags, as opposed to the previous one.
 2018-06-24 17:44:44 +01: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
5d6e883966 Fixes blueshield not having access 2018-06-15 08:50:06 -04:00
Mewchild
feb90e7790 Adds Eguns back to Cargo 2018-06-12 10:51:21 -05: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
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
Novacat
5addac95ed Pathfinder Update (#3777) 
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
 2018-05-31 16:57:40 -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
53db96d193 Merge pull request #5300 from Anewbe/more_runtimes 
Adds a number of accessory related null checks
 2018-05-26 15:23:03 -07:00
Anewbe
d8f1069689 Adds a number of accessory related null checks 2018-05-25 12:29:33 -05: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
Mechoid
e515725446 Defines 2018-05-22 20:59:26 -07:00
Mechoid
4a7ea5086a Seed Vendors are hackable. 2018-05-18 20:57:55 -07: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
Aronai Sieyes
dccb204c56 Merge branch 'master' into micromechs 2018-05-10 15:49:03 -04:00
Aronai Sieyes
72b7fcb7e7 Merge pull request #3658 from Heroman3003/category-ing 
Moved robolimbs crate to robotics category
 2018-05-10 15:46:42 -04:00