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
44,903 Commits 10 Branches 0 Tags
fcc2f9aa79d45901f556448b83cd2fc67f2b1366
Commit Graph

1649 Commits

Author SHA1 Message Date
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
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Repede
1b5cb2bafa Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 2018-07-17 20:30:33 -04:00
Anewbe
a3835d42f4 Merge pull request #5397 from Atermonera/boilerplate_list_fix 
Global list boilerplates cause the target path to actually add to the list
 2018-07-09 22:52:12 -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
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
Mechoid
3c35b7d13a Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 21:42:19 -04:00
Aronai Sieyes
a162c86d51 Merge pull request #3855 from VOREStation/upstream-merge-5341 
[MIRROR] Wires are under catwalks, fueltanks are over floor decals
 2018-06-15 08:57:22 -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
Atermonera
d768871055 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 15:41:54 -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
c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
 2018-05-29 21:05:27 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05: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
Anewbe
7e44e95d24 Corrects some plane and layer issues 2018-05-20 18:41:21 -05:00
Arokha Sieyes
7ec5adf010 Remove some missed spare helmets 
Fixes #3724
 2018-05-18 14:42:29 -04:00
deathride58
718ca41ea0 tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1 2018-05-16 01:42:01 -04:00
Arokha Sieyes
bdfa34c911 SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:54:10 -04:00
Arokha Sieyes
91f0c05a4b SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:38:22 -04:00
Aronai Sieyes
ba6a2b5641 Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01 
Polaris Sync 2018-05-01
 2018-05-13 23:20:18 -04: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
4706bf1801 Resolve shower curtain/steam layering issue 
Reported in https://github.com/VOREStation/VOREStation/issues/3594, curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
 2018-05-12 15:29:17 -04:00
Arokha Sieyes
c4f9017c76 Rename snake to giant snake 
To prevent mistakes like this in the future!
 2018-05-10 14:26:18 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
 2018-05-10 13:48:20 -04:00
Mechoid
4d028ee0f3 Removes my incompetence. 
Re-adds my incompetence.
 2018-05-08 18:41:47 -07:00
Mechoid
3a2f21ca31 Weak mobs (Below 10 damage output) cannot smash destroyable structures like Closets. 2018-05-08 16:19:44 -07:00
Arokha Sieyes
c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00