cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 23:46:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,492 Commits 66 Branches 25 Tags
ReddeyfishVor-patch-8
Commit Graph
20901 Commits
Author SHA1 Message Date
AtermoneraandGitHub d49ac27d7f Merge pull request #5102 from Verkister/orgons 
Fixes inconsistencies in organ system
 2018-03-31 12:15:51 -07:00
AtermoneraandGitHub 8b7fe2129a Merge pull request #5100 from Verkister/patch-10 
Re-establishes existing foundations for human icon construction
 2018-03-31 12:14:23 -07:00
ReddeyfishVorandGitHub e003b9296b Merge branch 'master' into newEvents 2018-03-31 11:12:26 -07:00
ReddeyfishVorandGitHub 4909f3f22b Add trash-edible glass container (#83) 
* Add trash-edible glass container

* Refactor to clearer item path, add flavortext

* Add autolathe cost
 2018-03-31 11:11:09 -07:00
ReddeyfishVorandGitHub b3583c5cad Merge pull request #88 from AnonymousHybi/master 
Modifies mistake's tail to have dual colours.
 2018-03-31 11:10:51 -07:00
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
AnewbeandGitHub da78c67eb1 Merge pull request #5101 from Verkister/patch-11 
Fixes custom accessories not showing up on things
 2018-03-30 19:34:18 -05:00
Reddeyfish 0b0b25a2aa Add wormhole event 2018-03-30 17:22:26 -07:00
AnewbeandGitHub 6caa8e08cf Merge pull request #5113 from Woodratt/03262018_44revolver 
44 revolvers
 2018-03-30 17:46:37 -05:00
NeertiandGitHub f26dd30aa5 Merge pull request #5114 from VOREStation/vplk-debug-admin 
Grant remote profile access to R_DEBUG holders
 2018-03-30 18:45:26 -04:00
Neerti f429a176e4 Adds Map Template Groups 
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.
 2018-03-30 05:34:11 -04:00
NanospliccerandReddeyfishVor 36dcee96b8 Commented out suicide... (#91) 2018-03-29 22:43:45 -07:00
ReddeyfishVorandGitHub dcf65b95c6 Auto events (#89) 
* add additional events to active rotation

* add almost all events to active rotation, with population requirements
 2018-03-29 21:00:06 -07:00
Arokha Sieyes 794185d3f2 Fixes infinite loop in FBP naming w/o client 2018-03-29 23:46:19 -04:00
NeertiandGitHub 9ff18723f4 Merge pull request #5128 from Atermonera/pai_mani 
Fixes #4951
 2018-03-29 23:21:15 -04:00
NeertiandGitHub f5c331b142 Merge pull request #5127 from VOREStation/vplk-table-layer-fixes 
Table Layering and Runtime Fixes
 2018-03-29 23:20:57 -04:00
AtermoneraandGitHub a54522751b Change of template 2018-03-29 18:16:04 -07:00
Leshana 15936a9eb1 Fixes Runtime in logging.dm,61 2018-03-29 21:05:53 -04:00
Leshana 779e6f177d Fixes machines being below tables they should sit upon. 2018-03-29 21:03:45 -04:00
Leshana 530c3e9a07 Fixes fullbright mode hiding lighting overlays. 
Fullbright plane master being above lighting plane master is important, shouldn't be removed.
 2018-03-29 20:20:47 -04:00
Reddeyfish 24d518a70d add almost all events to active rotation, with population requirements 2018-03-29 15:52:49 -07:00
AnonymousHybi 8192cfbf10 Modifies mistake's tail to have dual colours. 2018-03-29 23:21:25 +01:00
Leshana e14140d8dc Grant remote profile access to R_DEBUG holders 2018-03-29 13:52:53 -04:00
Reddeyfish 0f0eacfad1 add additional events to active rotation 2018-03-28 23:10:51 -07:00
LeshanaandGitHub 1ae7f45f1f Merge branch 'master' into vplk-port-pipeland-theta 2018-03-28 17:47:21 -04:00
elgeonmbandAtermonera 499f6c84df prettified lorecodex, added a month's worth of news (#5112) 
* prettified lorecodex : added a month's worth of news

* what the hell elgie

* all according to kaikoku
 2018-03-28 13:01:29 -07:00
elgeonmbandAtermonera 0a1e3d798b Lore-Compliant Oculum News Channel (#5111) 
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster

* new news channel containing lore-compliant news that's not bad
 2018-03-28 13:01:10 -07:00
Aronai SieyesandAtermonera 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
AtermoneraandAnewbe a2841ce9d6 Nanoui now supports use of multiple templates (#5105) 
* Nanoui now supports use of multiple templates

* Removing debug code, indentation

* Indentation
 2018-03-28 14:53:50 -05:00
AtermoneraandGitHub 6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear 
Adds permanent markers
 2018-03-28 11:49:10 -07:00
Arokha Sieyes 5a4a154248 Probably maybe fixes blank lines for prey 2018-03-27 20:22:40 -04:00
VerkisterandGitHub 16f84efe76 Update organ_icon.dm 2018-03-27 14:53:44 +03:00
VerkisterandGitHub 6cf57cdaa7 Update organ_icon.dm 2018-03-27 14:52:38 +03:00
VerkisterandGitHub 3bedfe11d5 byond beta back on its bullshit 2018-03-27 14:33:06 +03:00
Verkister 97f3361e6b Fixes feathered tesh tail and removes an useless piece of code. 
-Feathered tesh tail now uses the proper dual color system now that it no longer comes with the default tail.
-Removes completely redundant body hair code from robolimb icon generation.
 2018-03-27 14:31:32 +03:00
Woodratt 32860140b4 44 revolvers 
Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.
 2018-03-26 14:33:43 -07:00
AnonymousHybi 8979d933b1 Tweaked some things around teshari bug. 
Added in minimap images :3
 2018-03-26 15:33:26 +01:00
Arokha Sieyes f6321228a0 POLARIS: Adds an animation thing, uses it on ventcrawls 2018-03-25 17:42:48 -04:00
Arokha Sieyes 6072077d10 POLARIS: Add eye color to shapeshifters 2018-03-25 17:18:34 -04:00
Arokha Sieyes 9012958724 POLARIS: Heal robolimbs when you heal everything 
Typically only used in magic and stuff, makes sense to heal both (otherwise there's no way to heal whole FBP bodies)
 2018-03-25 17:15:11 -04:00
Arokha Sieyes 7cac2052b5 POLARIS: Fix incorrect robolimb checks 2018-03-25 17:14:46 -04:00
Arokha Sieyes f7d79855a0 POLARIS: Fix a call to the wrong update icons in prom regen 2018-03-25 17:14:21 -04:00
Arokha Sieyes e8258ff13f POLARIS: Beam weapons runtime when you shoot yourself 2018-03-25 17:09:56 -04:00
Arokha Sieyes 9f4a14b171 POLARIS: Weird snacks runtime 2018-03-25 17:09:33 -04:00
Arokha Sieyes 3d4fe98277 POLARIS: Allow crawling through vertical pipes 2018-03-25 17:08:53 -04:00
LeshanaandArokha Sieyes d738e99d2f POLARIS: Fix holders to avoid forcemoving held mob to nullspace 2018-03-25 17:08:29 -04:00
Arokha Sieyes e14857b169 POLARIS: Ventcrawling assistance 2018-03-25 17:07:54 -04:00
Arokha Sieyes a3fb959d98 POLARIS: Fixes #2573 (VS) - Slap cigarettes off people's faces 2018-03-25 17:05:34 -04:00
Arokha Sieyes f4e5aefebf POLARIS: Fixes #3221 (VS) - No explanation of what to do in the case of system instability 2018-03-25 17:04:50 -04:00
Arokha Sieyes 166d582a5b POLARIS: Fixes #3238 (VS) - Nothing but humans can understand silicons talking 2018-03-25 17:04:37 -04:00