cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 5 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

1782 Commits

Author SHA1 Message Date
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Rykka
283f7b6cfd Adds // Vorestation edit 2019-09-27 15:18:54 -06:00
Rykka
9d8973ef00 Attempts changes again without atrocious filediff 2019-09-27 14:54:50 -06:00
Hawk_v3
fc97b8233b Merge remote-tracking branch 'upstream/master' 2019-09-08 18:55:37 +01:00
Atermonera
3c36be2390 Merge pull request #6446 from Heroman3003/solarfix 
Fixes solar panel assembly dupe
 2019-09-07 23:34:46 -04:00
Hawk_v3
b6ebecf7ec Merge remote-tracking branch 'upstream/master' 2019-08-30 21:38:17 +01:00
Heroman
819d211b23 Fixes power not updating when shuttle moves 2019-08-28 18:21:52 +10:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Heroman
bab3ae66dd Reduces power consumption of active lights 2019-08-14 16:50:30 +10:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01: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
Hawk_v3
6745d5ce95 Fixes infinite solars. 
Solar assemblies were missing a Qdel. All done. Fixes #97
 2019-07-09 20:31:41 +01:00
Hawk_v3
5c3569b208 Fix for non-compile. 
Fittings aren't defined anymore, but calculated from the bulb they take.
 2019-07-02 19:04:53 +01:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Anewbe
b820ac6844 Merge pull request #6246 from Heroman3003/lightfix 
Fixes construction of lights
 2019-06-30 19:40:15 -04:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Unknown
f1d61de589 Buffs Lights post-light changes 2019-06-18 21:20:06 -04:00
Novacat
d9db3676eb GRUMBLE GRUMBLE CODE STANDARDS GRUMBLE GRUMBLE 2019-06-18 20:33:21 -04:00
Novacat
0c5e7c5de6 Update lighting.dm 2019-06-18 20:01:52 -04:00
Novacat
03a3944f36 An assortment of Lighting Stuff 2019-06-18 19:57:40 -04:00
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01:00
Atermonera
88df3de3e6 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy 
Infinite Frame Fixy
 2019-06-06 13:11:59 -04:00
Hawk_v3
3aa4e406f9 Merge remote-tracking branch 'upstream/master' 2019-05-15 14:46:50 +01:00
Atermonera
994e12e1d2 Merge pull request #6162 from Heroman3003/smashing 
Fixes smasher recipies being microwave ones
 2019-05-11 16:04:54 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04:00
RadiantFlash7
44060adba4 Merge pull request #1 from Yawn-Wider/map 
Merging fresh upstream changes into my branch
 2019-04-14 15:41:12 -04:00
RadiantFlash7
1330ad2a07 Fixing broken code from merge\ 
Fixing missing map animals and missing icon files.
 2019-04-14 15:37:22 -04:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Unknown
40a0eaed13 SMESs no longer turn off when out of power 
Ported from Baystation PR #11973, Mirrored to Polaris PR
 2019-04-11 11:26:08 -04:00
Heroman3003
16fb2c1036 Fixes tesla logic bug 2019-04-10 12:00:24 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -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
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
55b4d304f5 Conflict Resolution Part One 2019-03-27 15:21:58 -04:00
Novacat
a9f4906995 Merge pull request #4667 from VOREStation/upstream-merge-5772 
[MIRROR] Refactors poi rotation to use degrees instead of dir
 2019-03-27 15:16:02 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Novacat
1599c9881d Merge pull request #4661 from Heroman3003/fuck-is_multitool 
Removes the usage of non-working is_tool procs
 2019-03-27 14:12:08 -04:00
Neerti
ee18328ce0 Refactors poi rotation to use degrees instead of dir 2019-03-27 12:57:16 -04:00