cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-06 22:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,287 Commits 10 Branches 0 Tags
2b0aff0b6d9bcba6da4ba44b83516e0443fbb708
Commit Graph

2990 Commits

Author SHA1 Message Date
Repede
2b0aff0b6d Merge branch 'master' into self 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types_vr.dm
#	icons/obj/tank_vr.dmi
 2018-06-23 17:56:05 -04: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
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Repede
41ec39ab59 Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff list) 2018-06-15 23:39:13 -04:00
Hawk_v3
15403798d8 Fixed missing backsprites 
Forgot about those. I simply renamed the tanks as the old one was removed anyway. Apologies.
 2018-06-15 22:49:38 +01:00
Repede
5d6e883966 Fixes blueshield not having access 2018-06-15 08:50:06 -04:00
Repede
3c07607014 Fixes to map branch to allow blueshield job in 2018-06-13 00:22:19 -04:00
Hawk_v3
9a3933517d Fix and Additions to Vox Tanks 
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
 2018-06-12 17:59:38 +01:00
Unknown
ebfaf885f3 Fix and Additions to Vox Tanks 
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
 2018-06-12 17:06:31 +01: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
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
190dd08fc4 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 19:08:31 -04:00
Anewbe
1800e1696f Merge pull request #5325 from elgeonmb/patch-7 
Changes experimental welder fluff
 2018-06-04 16:13:35 -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
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
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-05-23 00:13:07 -04:00
Unknown
2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Tad Hardesty
927050ce44 Fix various syntactic problems 2018-05-16 21:43:18 -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
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
Spades
ba5bfa00bb Merge pull request #3583 from Verkister/chompychomp 
Adds a funky fresh feature to beartraps.
 2018-05-05 08:32:38 -04:00
Cameron653
e47fe15fbf Fixes a comment that caused developers to scratch their heads. 
Glass has a hardness of 30 https://github.com/PolarisSS13/Polaris/blob/master/code/modules/materials/materials.dm#L433

Thrown_force_divisor multiplies by 1.5. 
WHY THE HELL IS THIS A MULTIPLIER INSTEAD OF A DIVISOR ???? WHAT MADMAN NAMED THESE VARIABLES? https://github.com/PolarisSS13/Polaris/blob/master/code/game/objects/items/weapons/material/material_weapons.dm#L56

p.s: Marble spear does 50 damage per hit. may wanna nerf that. It's a 2 tile attack that does 50 damage. 
When thrown, marble spear does 39 damage, since it multiplies the blunt damage (26) by 1.5
 2018-05-03 22:44:07 -04:00
Anewbe
70b23e905e Merge pull request #5209 from VOREStation/pol-medsound 
Ports the medical item sounds from Bay
 2018-05-02 22:11:03 -05:00
Neerti
cd2a538526 Merge pull request #5207 from Novacat/bluespace_duffle 
Dufflebag of Holding
 2018-05-02 22:41:27 -04:00
Repede
a039be7b30 Makes CD ID Card not swallowable by cryo, plus custom fluff rig not swallowable by cryo 
More attempts at fixing nagarigs
 2018-05-02 08:56:13 -04:00
Atermonera
44cc2e26c7 Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD 
for(var/bad_code in world)
 2018-05-01 13:00:18 -07:00
Atermonera
b75b3c539e Merge pull request #5226 from Lorwp/drillmeta 
Destroys Drill meta 2: Electric Boogaloo
 2018-05-01 12:38:19 -07:00
Mechoid
1db4c4b677 ~Promethean Tweaks: The one with the chemicals, and the other thing. (#5201) 
* Promethean Tweaks Round Howevermany We're On Now

* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.

* Add Blurb other than just "What has science done?"

* Adds the changelog.

* Fixes the stupid.

* Fixfix @ Ater
 2018-05-01 12:23:47 -07:00
Neerti
be73b8c36a for(var/bad_code in world) 
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
 2018-04-29 17:55:04 -04:00
Lorwp
1120e53d36 Destroys Drill meta 
Makes screwdriver hand drills not fit in places a normal screwdriver can
 2018-04-28 20:05:19 +10: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
Arokha Sieyes
1d0aeb95bd Increase zealousness of Portable Freezer item whitelist 2018-04-27 20:16:57 -04:00
Verkister
f01a8fffe3 hurrgh 2018-04-28 00:28:15 +03:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	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-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Arokha Sieyes
ab1351f00d Ports the medical item sounds from Bay 
A port of https://github.com/Baystation12/Baystation12/pull/21268, which adds sounds to the healing item stacks, taperolls, and hyposprays
 2018-04-25 14:39:49 -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
Unknown
906db88b6a Dufflebag of Holding 
Adds a dufflebag of holding, essentially a bag of holding reskin that functions exactly identical
 2018-04-24 02:09:39 -04:00
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04:00
MarinaGryphon
9e57b11a87 Fixes various implant/admin verb typos (#5177) 
* Removes 'independant'

* Update Space Station 13 areas.dm

* Fixes the AI law typo

* Fixes another typo.

Somewhat out of scope(?), but it's just a typo.
 2018-04-17 23:05:12 -05:00
Leshana
b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
Anewbe
8adf777a72 Merge pull request #5167 from Heroman3003/sheet-snatch-fix 
Fixed sheet snatcher spawning stacks with wrong looking icon
 2018-04-13 14:01:17 -05:00
Aronai Sieyes
83c27b175f Merge pull request #3446 from Heroman3003/fuzzy-legcuffs 
Added fuzzy legcuffs
 2018-04-12 18:42:54 -04:00
Heroman3003
1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Heroman3003
dd2a46281e Added fuzzy legcuffs 2018-04-13 04:56:16 +10:00
Heroman3003
32daa7a0d2 Fixed sheet snatcher spawning stacks with wrong looking icon 2018-04-12 21:55:24 +10:00
Verkister
90175bb1aa adds proper bags 2018-04-12 09:26:02 +03:00
Verkister
9f21628619 Adds deer taur. 
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
 2018-04-11 17:14:21 +03:00
Anewbe
8c23ec4844 Merge pull request #5153 from Neerti/4/5/2018_tile_attacking 
Adds Tile-based Attacks
 2018-04-09 19:16:58 -05:00