cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,726 Commits 7 Branches 0 Tags
ccbf7cf28c9e550f68b11c08c56f368334a7693d
Commit Graph

21596 Commits

Author SHA1 Message Date
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
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
Mechoid
18e91702d2 Keys now actually exist again. 2018-09-24 13:21:38 -07:00
Atermonera
b8314c336c Merge pull request #5593 from Anewbe/machine_tweaks 
Tweaks emitters and Pacman
 2018-09-24 11:02:11 -07:00
Mechoid
37342fc2d6 Adds a generic proc to the mining vendor to add custom / blank entries. 2018-09-23 02:21:54 -07:00
Mechoid
28d4f39aff Be Smart about damage things. 2018-09-22 17:59:24 -07:00
Mechoid
b3f40308ca Adds some Holy drinks, and Promethean-safe drinks / acclimators. (#5574) 
* Adds some Holy drinks, and Promethean-safe drinks / acclimators.

* Carbon + Water + Oil = Sludge

* TRUEFALSE & * removed
 2018-09-22 18:53:55 -05:00
Anewbe
a942e145b6 Tweaks emitters and Pacman 2018-09-22 18:45:57 -05:00
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys 
Technically adds the Ore Redemption Machine
 2018-09-22 13:38:10 -07:00
Atermonera
b07144a7c8 Merge pull request #5587 from Anewbe/wind 
Wind in storms slightly nerfed
 2018-09-22 12:10:33 -07:00
Anewbe
a31813145f Psychiatric Medication Fix (#5588) 
* Psychiatric medications are faster when ingested

* Psychiatric med fix
 2018-09-22 12:08:20 -07:00
Mechoid
86504d1e4d Make the Statue NOT entirely immortal. 2018-09-22 01:11:38 -07:00
Anewbe
c75741545a Descriptors now properly respect species differences 2018-09-20 19:30:25 -05:00
Neerti
50decef580 Merge pull request #5576 from Anewbe/dermal_implant_fix 
Dermal implant doesn't cover hair
 2018-09-19 16:08:37 -04:00
Neerti
bc331befd9 Merge pull request #5576 from Anewbe/dermal_implant_fix 
Dermal implant doesn't cover hair
 2018-09-19 16:08:28 -04:00
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic 
Ports /vg/ instrument frame work, adds client based sound pref toggle.
 2018-09-19 15:04:06 -05:00
Anewbe
d5979ec960 Merge pull request #5575 from Woodratt/09172018_spacesuitmess 
Rig and Spacesuit additions
 2018-09-19 15:00:30 -05:00
Woodratt
5a312e14d1 Update combat.dm 2018-09-19 12:11:11 -07:00
Anewbe
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -05:00
Anewbe
596e51da42 Dermal implant doesn't cover hair 2018-09-18 13:15:51 -05:00
Atermonera
c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob 
More Blob modularity / Event-Manager compatability, Nests.
 2018-09-18 11:11:51 -07:00
Woodratt
9f24c4eba2 Rig and Spacesuit additions 
- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits

None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.
 2018-09-18 00:35:06 -07:00
Atermonera
f2ac15be91 Merge pull request #5511 from Anewbe/descriptors 
Ports character physical descriptors from Bay
 2018-09-17 11:21:28 -07:00
Atermonera
ee95a53d98 Merge pull request #5563 from Mechoid/We_are_going_to_Cyber_Space 
Cybersuit is now a space rig.
 2018-09-17 11:17:49 -07:00
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom 
Vehicle Expansion 1: Zoom Harder
 2018-09-17 11:14:54 -07:00
Spades
cccad0f12e Merge pull request #4124 from VOREStation/upstream-merge-5465 
[MIRROR] Removes supermatters from cave PoIs.
 2018-09-17 14:12:25 -04:00
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -04:00
Spades
b59fd4b551 Merge pull request #4122 from VOREStation/upstream-merge-5464 
[MIRROR] Makes arcing projectiles exist in the code.
 2018-09-17 14:11:46 -04:00
Spades
2480396c02 Merge pull request #4120 from VOREStation/upstream-merge-5460 
[MIRROR] APC Sprite Change
 2018-09-17 14:06:42 -04:00
Spades
089655639b Merge pull request #4114 from VOREStation/upstream-merge-5458 
[MIRROR] Let beams be shown in the Type var selection in View Variables.
 2018-09-17 14:05:30 -04:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Verkister
b0c42682df Fixes curious rat getting stuck spammily. 2018-09-15 00:31:41 +03:00
Anewbe
c12d7e25b0 Readds size traits 2018-09-13 17:22:11 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Mewchild
f61e26d197 Fixes error. Shuts Travis up. 2018-09-12 19:09:51 -05:00