cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,034 Commits 9 Branches 0 Tags
6eb4e5eb82057c81d86f3bbdcdf9b36a1aa4f772
Commit Graph

610 Commits

Author SHA1 Message Date
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Unknown
bbf1fc1420 Recommended changes 2019-08-31 15:31:45 -04:00
Cameron Lennox
9f6e4df7eb Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood. 2019-08-31 14:41:24 -04:00
Andrew
e4deaa6478 Combat Mechs Can Punch More Things (#6303) 
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
 2019-07-24 17:00:24 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
if there were two guys on the moon
d5f380984f Medbeam 2019-06-29 20:04:47 +01:00
Heroman
141f7e649a Fixes non-mob mobs being able to use portals 2019-04-08 20:42:59 +10:00
Unknown
9197cfeaeb New Bluespace Sprites 2019-03-31 04:35:24 -04:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Unknown
d7e248a09e Might need a little help for the last two... 2019-03-29 00:12:32 -04:00
Novacat
bada08276f Merge branch 'master' into upstream-merge-5959 2019-03-28 20:30:41 -04:00
Unknown
d3837b76e8 Conflict Resolution 2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Novacat
05cc6d7df3 Update step_triggers.dm 2019-03-28 15:18:23 -04:00
Novacat
8fcc46a6c9 Merge branch 'master' into upstream-merge-5912 2019-03-28 15:12:46 -04:00
Unknown
cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
823354433e Merge pull request #4659 from VOREStation/upstream-merge-5796 
[MIRROR] Adds New PoI Features + Bonus PoI
 2019-03-27 13:52:46 -04:00
Novacat
42df71908b Merge pull request #4644 from VOREStation/upstream-merge-5803 
[MIRROR] Guns sounds refactor and improvements
 2019-03-27 12:35:26 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Novacat
9e00a1b164 Merge pull request #4641 from VOREStation/upstream-merge-5808 
[MIRROR] CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
 2019-03-27 11:22:21 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Spades
4320afc530 Merge branch 'master' into upstream-merge-5757 2019-03-02 08:05:51 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Neerti
a0c757cd05 Adds a new Shroud design 2019-02-18 03:52:22 -05:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Neerti
f7df9d021b Mechs can travel to the mines again 2019-01-30 00:21:54 -05:00
Anewbe
7642ce76fa Merge pull request #5808 from Ragolution/master 
CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
 2019-01-06 13:15:13 -05:00
Neerti
60f88039ea Adds several new map/event oriented objects 2018-12-07 18:49:01 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05: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
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys 
Technically adds the Ore Redemption Machine
 2018-09-22 13:38:10 -07:00
Anewbe
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -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
Atermonera
7d288746ad Merge pull request #5486 from Mechoid/RisingBills 
The Major Bill's shuttle is actually contagious now. Gibs are spaced.
 2018-08-08 20:40:04 -07:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07:00
Mechoid
493d7fcaa7 The Major Bill's shuttle is actually contagious now. 2018-08-07 21:08:03 -07:00
Anewbe
d51828e88d I don't know how we keep breaking falling 2018-08-05 16:08:18 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Neerti
6bdf355e6d Finishes thunderstorms. 2018-07-31 14:45:26 -04:00
Neerti
8639d49c34 Begins work on lightning. 2018-07-28 11:08:30 -04:00