cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,673 Commits 10 Branches 0 Tags
e20f05e1884d538410c1d9a6ecb75dcc47047a1c
Commit Graph

33105 Commits

Author SHA1 Message Date
Unknown
e20f05e188 Expedition Balance Tweaks 
- Removes hostile mobs from V4 Beach
- Adds Giant Snakes and Giant spiders in generic V4 Cave spawners
- Reduced respawn rates to cut down on incidences of 'deathclaw swarms'
- Giant Snakes and Deathclaws have reduced overall spawn rates, Giant Spiders and Frogs will generally be more common.
- Replaced Ion hivebots with Ion Spiders
- Reduced expedition phaser to 5 shots
 2018-10-04 21:55:27 -04:00
Spades
c8c7843b8c Merge pull request #4297 from Mewchild/MC-SecPatchFix 
Changes Secpatch Path in Loadout
 2018-10-02 19:48:40 -04:00
Spades
0f83a1932e Merge pull request #4301 from VOREStation/upstream-merge-5619 
[MIRROR] Text for handheld plushies when poked
 2018-10-02 18:01:24 -04:00
Spades
9ce8b0a6be Merge pull request #4300 from VOREStation/upstream-merge-5621 
[MIRROR] Fixes some bloodloss bugs
 2018-10-02 18:00:50 -04:00
Anewbe
9498d6f7db Merge pull request #5619 from SpadesNeil/toy-sounds 
Text for handheld plushies when poked
 2018-10-02 14:20:47 -04:00
Atermonera
7b92808a20 Merge pull request #5621 from Anewbe/hemophilia 
Fixes some bloodloss bugs
 2018-10-02 03:11:29 -04:00
Anewbe
9b9410e5cb Merge pull request #5618 from Verkister/patch-15 
Fixes grabs breaking defined mob pixel offsets.
 2018-10-01 21:25:57 -04:00
Spades
3f1a5de182 Merge pull request #4240 from Mewchild/MC-Medals 
Medal Whitelists from abduction event
 2018-10-01 19:22:20 -04:00
Mewchild
19ed4485c1 Changes Secpatch Path in Loadout 2018-10-01 09:36:16 -05:00
Spades
d0717c1f45 Merge pull request #4295 from VOREStation/aro-gatewayscatter 
Fix gateway scatter landmarks
 2018-10-01 09:31:36 -04:00
Spades
020d760ede Merge pull request #4294 from VOREStation/aro-proteandrop 
Proteans drop items when blob
 2018-10-01 09:31:14 -04:00
Spades
4a00acc6d4 Merge pull request #4291 from VOREStation/upstream-merge-5613 
[MIRROR] Custom RIG Framework
 2018-10-01 09:30:24 -04:00
Spades
d243d80132 Merge pull request #4290 from VOREStation/upstream-merge-5614 
[MIRROR] Hyposprays can now have different sounds
 2018-10-01 09:29:43 -04:00
Spades
ac85199b6b Merge pull request #4293 from VOREStation/aro-nifgibdrop 
Drop NIFs when gibbed
 2018-10-01 09:29:29 -04:00
Spades
d68b641d6b Merge pull request #4287 from Verkister/smallvoreqol 
Small qol tweaks for contamination and sleeperguts.
 2018-10-01 09:29:08 -04:00
Spades
a36a591822 Merge pull request #4285 from VOREStation/upstream-merge-5611 
[MIRROR] Phase rifle size correction
 2018-10-01 09:28:38 -04:00
Spades
93dde92e42 Merge pull request #4283 from VOREStation/upstream-merge-5605 
[MIRROR] Species item slowdown changes
 2018-10-01 09:24:54 -04:00
Spades
e795040d68 Merge pull request #4244 from Verkister/patch-23 
Fixes curious rat getting stuck spammily.
 2018-10-01 09:24:02 -04:00
Spades
718a96db61 Merge branch 'master' into MC-Medals 2018-10-01 09:23:19 -04:00
Spades
587fd193a1 Merge pull request #4226 from Mewchild/MC-SecPatch 
Adds Security Eyepatch
 2018-10-01 09:20:37 -04:00
Spades
80de5331f0 Merge pull request #4296 from VOREStation/phoron-scrubbing 
Restores phoron scrubbing to vents
 2018-10-01 09:20:05 -04:00
Spades
c6acdd5fe9 Merge pull request #4234 from Novacat/nova-heterochromia 
Tactical Kittens
 2018-10-01 08:49:19 -04:00
Spades
852eae3092 Merge pull request #4208 from lbnesquik/master 
Minor dogborgs quality of life update
 2018-10-01 08:47:25 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018 
Polaris Sync 09-27-2018
 2018-10-01 08:43:03 -04:00
Spades
c2ac5bc3b9 Restores phoron scrubbing to vents 
I still say the changes were silly for Polaris, but for Virgo, they're
downright suicidal, so naturally we won't have this change.
 2018-10-01 08:42:23 -04:00
Verkister
519dff6fb9 Disabled contamination on itemweak hold mode. 
-Still applies on food tho.
 2018-10-01 09:11:28 +03:00
Arokha Sieyes
62c1e2d575 Fix gateway scatter landmarks 
They're pinned to only working if you use the old fashioned map loading text file thing, and won't work with admin-loaded maps or anything like that.
 2018-10-01 00:03:39 -04:00
Arokha Sieyes
8b7579ee1b Proteans drop items when blob 
Bit of a rebalance on their blobbyness.

They drop most of their inventory when they blob. They keep: uniform, pockets, id, ears, nif but not other implants. Everything in that list but uniform can only hold small or tiny items.
Uniforms are stripped of accessories, so you can't sneak stuff in webbings or holsters.
 2018-09-30 23:30:30 -04:00
Arokha Sieyes
29d4a3b80c Drop NIFs when gibbed 
And when you die as a promethean (which always gibs you) cus Cheri is a whiner
 2018-09-30 22:44:26 -04:00
Mechoid
78b173b50a Custom RIG Framework (#5613) 
* Framework for Custom RIG sprites.

* Fixfix
 2018-09-30 17:50:39 -04:00
Aronai Sieyes
08c3550f3a Merge pull request #4286 from VOREStation/aro-proteanmsg 
Dumb typo on protean messages
 2018-09-30 17:47:49 -04:00
Aronai Sieyes
8da0509f7e Merge pull request #4288 from VOREStation/aro-proteanbrain 
Fixes protean brain icons
 2018-09-30 17:47:42 -04:00
Atermonera
ebb89d6c59 Merge pull request #5614 from Anewbe/autospray 
Hyposprays can now have different sounds
 2018-09-30 03:45:40 -04:00
Arokha Sieyes
e1245025b2 Fixes protean brain icons 
Was supposed to have a special sprite
 2018-09-29 19:43:59 -04:00
Verkister
7a148f2a9d Small qol tweaks for contamination and sleeperguts. 
-Removed the toxicity of gurgled items. (Planning to make them affect the user's examine flavor when equipped though.)
-Removed the silly animation on mess overlay. (possible remake later with extra flavors etc)
-Fixed sleeperbellies not suppressing injury emotes and deathmessages during digestion.
-Ruled out the possibility of the sleeperbellies breaking over defined "patient" going "missing".
 2018-09-29 16:07:22 +03:00
Arokha Sieyes
fed4b51b39 Dumb typo on protean messages 2018-09-28 23:11:57 -04:00
Atermonera
9619d3ad31 Merge pull request #5611 from Anewbe/phase_rifle 
Phase rifle size correction
 2018-09-28 22:37:14 -04:00
Spades
9e86743d00 Merge pull request #4163 from Mewchild/MC-Syringes 
Reverts Syringe infections
 2018-09-27 19:38:08 -04:00
Spades
e37ac96b25 Merge pull request #4176 from iskawhiskers/master 
Add "monster mouth" and "blank round face" sprites to body markings
 2018-09-27 19:36:22 -04:00
Spades
c0b0621503 Merge pull request #4166 from deathride58/characterdirectory 
Adds the character directory
 2018-09-27 19:35:53 -04:00
Unknown
dbb362820f Changes to use spawner grenade 2018-09-27 18:40:12 -04:00
Atermonera
e49090ecac Merge pull request #5605 from Anewbe/species_tweaks 
Species item slowdown changes
 2018-09-27 18:28:58 -04:00
Arokha Sieyes
cb43ac69ea Satisfy stupid indentation.awk, which is just wrong. 2018-09-27 18:22:55 -04: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
Neerti
28724f3157 Fixes Circuitry Glasses. 
Button in HUD should work now.
 2018-09-25 22:21:35 -04:00
Neerti
c0e43d9cc1 Merge pull request #5607 from Anewbe/pose 
Pose now shows up under descriptors
 2018-09-25 02:35:04 -04:00
Anewbe
a5b26786ad Pose now shows up under descriptors 2018-09-24 18:42:03 -05:00
Anewbe
073597fc37 Merge pull request #5604 from Mechoid/Fix_My_Idiocy 
Keys now actually exist again.
 2018-09-24 16:23:31 -05:00
Anewbe
3f9896b0b5 Merge pull request #5590 from Mechoid/Statue_Stupidity 
Make the Statue 'better'.
 2018-09-24 16:07:57 -05:00
Anewbe
0fd9af6580 Merge pull request #5600 from Mechoid/Motherlode_2_Abuse_Strikes_Back 
Adds a generic proc to the mining vendor to add custom / blank entries.
 2018-09-24 16:07:34 -05:00