cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,675 Commits 6 Branches 0 Tags
e6e755d09dacd156a164ed430a53fffb5eb5881a
Commit Graph

672 Commits

Author SHA1 Message Date
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
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Arokha Sieyes
679b390007 POLARIS: Fixes #2601 (VS) - Allows mechs to continue charging after battery swap w/o moving 2018-03-25 17:05:06 -04:00
Aronai Sieyes
c7a6904fce Merge pull request #3296 from VOREStation/aro-odywhitelist 
Ody reagent whitelist
 2018-03-20 21:47:59 -04:00
Arokha Sieyes
009754e822 POLARIS: Fixes #2601 (VS) - Allows mechs to continue charging after battery swap w/o moving 2018-03-20 18:38:56 -04:00
Arokha Sieyes
497eddc38f Apply requested ody whitelist changes 2018-03-20 13:54:54 -04:00
Arokha Sieyes
2801ce38d4 POLARIS: Ody can now produce THESE REAGENTS ONLY 2018-03-19 00:08:55 -04:00
Arokha Sieyes
68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
Belsima
085f88cdc9 GORILLA - The Revival (#4957) 
* GORILLA

* is this absolute

* less indentation

* Minor balance adjustments

* Mech update
 2018-02-28 22:33:56 -06:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-05 15:50:13 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-03 01:00:57 -05:00
Aronai Sieyes
dea4e7fbc7 Merge pull request #2888 from Screemonster/nosavagebeatings 
nerfs micromech punches
 2018-01-30 16:08:46 -05:00
Screemonster
34bd240fe4 nerfs micromech punches 2018-01-30 01:12:13 +00:00
Screemonster
e953708ddd FUCKING COMMENTS 2018-01-30 00:15:49 +00:00
Screemonster
a0f2a06fe5 does it more betterer and why the fuck didn't I think of this in the first place 2018-01-30 00:12:43 +00:00
Screemonster
b4cc07e218 Improves the ripley slightly 2018-01-29 15:10:04 +00:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545) 
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
 2018-01-17 13:45:54 -06:00
Anewbe
c632c2604d Merge pull request #4533 from VOREStation/pol-mecha 
Two interface QoL changes (closets and mechs)
 2018-01-15 01:31:29 -06:00
Neerti
96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527) 
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
 2018-01-14 14:58:15 -06:00
Arokha Sieyes
1f595cd59a Two interface QoL changes (closets and mechs) 2018-01-14 03:58:15 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Mechoid
2145b0371c Allows circuit printers, protolathes, mech fabricators, and prosthetic fabricators to store and use plastic and osmium sheets. No blueprints currently use either, however. 2018-01-08 21:25:52 -08:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Belsima
ff35fe9f56 Adds the disabled mech tools. (#4445) 
* Adds the disabled mech tools.
 2017-12-29 21:44:04 -08:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
595dee475a Merge pull request #4441 from Nalarac/OddySleeper 
Fixes Odysseus Sleeper Being Unable to Inject Chemicals
 2017-12-17 13:04:27 -05:00
Andrew
eba7b63937 Fixes Odysseus Sleeper Being Unable to Inject Chemicals 
Fixes #869
Reduces inject to 5 per instead of 10 per (same cap)
Adds verb for occupants of sleeper to eject themselves
 2017-12-16 13:23:44 -06:00
Neerti
2f7db506eb Adds Variable Click Delay 
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
 2017-11-28 16:11:56 -05:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
mistyLuminescence
430b2b613f MedHUDs can identify FBPs 2017-10-23 15:09:22 +01:00
Cameron653
35afdc29c9 Fixes a 512 compile error. 2017-10-17 23:40:07 -04:00
Anewbe
4a6cf66183 Merge pull request #4087 from Mechoid/Efficient_Me_Fabricators 
Fixes SCIENCE-fabs, Changes Mech-fab Sprite.
 2017-10-16 23:01:43 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Mechoid
4a71de6b62 Mech and Prosthetic Fabricators now check to make sure they have the correct amount of material, respecting upgrades, rather than the base object cost. 2017-10-16 12:02:46 -07:00
killer653
3cd3054811 Fixes filter being used, which prevented compiling 2017-10-15 19:01:55 -04:00
Mechoid
56ec5ec94c Adds three flame-themed illegal Mech weapons and more. (#4058) 
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.

* Removes world << because I'm a good coder honest.

* Why does Git do this for no reason.
 2017-10-13 23:32:52 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Mechoid
b4a323ec38 Fixes Brain-Mechs, and a tangentially related MMI runtime. 2017-09-29 20:29:30 -07:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe
61936496b1 Merge pull request #3813 from Belsima/clickityclack 
Adds a metric assload of sounds.
 2017-09-20 22:20:17 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima
1fc7bc7674 Adds a metric assload of sounds. 2017-09-10 14:34:43 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820 
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
 2017-06-10 22:41:51 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820 
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
 2017-06-05 22:10:06 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
 2017-06-01 17:27:00 -04:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00