cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,862 Commits 8 Branches 0 Tags
f20f331fd6fb2bc1c2d6540ec9804cfa00d7ca08
Commit Graph

1169 Commits

Author SHA1 Message Date
Atermonera
e8020dec9d Merge pull request #5335 from Anewbe/hair_stealing 
Ports some Bay hair code
 2018-06-12 00:43:43 -07: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
Anewbe
1d054fd29e Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 20:49:11 -04:00
Anewbe
58cca27282 Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 17:48:04 -07:00
Atermonera
f7d77629af Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 15:39:37 -04:00
Anewbe
a8be0c1c82 Change-Eye-Color verb should work again 2018-06-08 18:54:49 -05:00
Anewbe
17a295b579 Ports some Bay hair code 2018-06-06 20:20:23 -05: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
fad161aeb7 Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 16:22:56 -04:00
SubberTheFabulous
4c6f5add29 Two new unbranded prosthesis 2018-06-01 23:15:25 +07:00
Mechoid
07e8ee1f50 Merge pull request #5289 from fludd12/splat 
Prometheans can now be revived as originally intended.
 2018-05-30 21:14:14 -04:00
Mechoid
8178c2bf1f Merge pull request #5289 from fludd12/splat 
Prometheans can now be revived as originally intended.
 2018-05-30 18:13:26 -07: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
Mechoid
917c7b71a5 Box of Things for Events and the Future MK1 (#5281) 
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
 2018-05-25 16:26:31 -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
97748146bc Merge pull request #5287 from VOREStation/pol-smite 
Adds 'Smite' verb and pray button
 2018-05-24 14:53:16 -05:00
fludd12
30779d1204 Prometheans can now be revived as originally intended. 2018-05-24 10:03:13 -04:00
Arokha Sieyes
be45e56f2f Adds 'Smite' verb and pray response button 
For easier adminbuse!
 2018-05-23 13:47:48 -04:00
Arokha Sieyes
89a36024c2 Adds 'Smite' verb and pray response button 
For easier adminbuse!
 2018-05-23 13:47:16 -04:00
Mechoid
37a8410d38 Tweak Prometheans, Again. 2018-05-17 18:18:13 -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
Arokha Sieyes
f1e47c85f4 Xenochimera can't take synth limbs 
As requested in, and Resolves #3564
 2018-04-30 15:45:50 -04: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
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
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
Aronai Sieyes
a849010ab1 Makes organ removal/attachment right again (#5192) 
* Makes organ removal/attachment right again

* Limb reattach - Changeo Loggo
 2018-04-25 12:03:10 -07:00
Cameron653
d9be096edb Fixes tesh being able to use all prosthetics 
Thanks to Aronai for the solution
 2018-04-23 23:03:00 -04:00
Cameron653
a6b25bc79a whoops 
Credit to Nestor for doing the original coding, however.
 2018-04-23 17:00:32 -04:00
Cameron653
aa97863a73 Ever hit the "push" button and then realize "Oh shit I forgot something"? 2018-04-23 16:54:22 -04:00
Cameron653
6c75c72dd2 Adds missing Teshari DSI 
https://i.imgur.com/UmrLEDT.png - (White)
https://i.imgur.com/vXGIFi3.png - (Light Blue)
https://i.imgur.com/H8NFgTD.png (Light Pink)
Operates the same as every other DSI.
 2018-04-23 16:51:37 -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
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
Repede
ae850864ba Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
 2018-04-03 19:57:04 -04:00
Atermonera
d49ac27d7f Merge pull request #5102 from Verkister/orgons 
Fixes inconsistencies in organ system
 2018-03-31 12:15:51 -07:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.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/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Arokha Sieyes
95877cc30a POLARIS: Fixes #3308 (VS) - Skrell lack eyes 2018-03-25 16:54:50 -04:00
Arokha Sieyes
98ca792b51 Increase prom limb health by 60% 2018-03-25 10:51:44 -04:00
Verkister
bf8bfc6e00 Fixes inconsistencies in organ system 
-Seems the years old conversion to turn old limb names and tags and such to BP constants was never finished.
-This also fixes warning spammy diona organ tags.
 2018-03-24 16:40:58 +02:00
Repede
7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
 2018-03-23 20:25:18 -04:00
Anewbe
3df290f46f Ports antibiotics overhaul (#5050) 
* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles
 2018-03-22 09:55:49 -07:00
Arokha Sieyes
39d3eeac62 Change to Teshari to test for bug 
Removing these, to see if they are related to the Teshari bug. These are the only two unique sprite features that I can see.
 2018-03-21 23:24:41 -04:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04:00
Arokha Sieyes
f062abdcfa POLARIS: Fixes #3308 (VS) - Skrell lack eyes 2018-03-20 14:22:51 -04:00
Arokha Sieyes
8b647cce73 VS: Fix various screams and emotes in bellies 2018-03-18 20:36:00 -04:00
Arokha Sieyes
decfbef934 POLARIS: Dropped limbs go into the drop location of the victim 2018-03-18 20:10:08 -04:00
Arokha Sieyes
44871477a0 POLARIS: Fix a couple organ dropping bugs 2018-03-17 22:15:13 -04:00
Arokha Sieyes
299f6e4299 VS: Nano ignores organ robotics sometimes 2018-03-17 19:45:59 -04:00
Arokha Sieyes
42e3261428 Final tweaks 2018-03-17 12:33:04 -04:00
Arokha Sieyes
2107372404 Protean species 2018-03-17 12:14:13 -04:00
Aronai Sieyes
29ae148dcf Merge pull request #3244 from VOREStation/aro-infectheal 
Prevent infections from healing you, small tweaks
 2018-03-16 19:54:38 -04:00