cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,643 Commits 7 Branches 0 Tags
88c4ca02460ac37b95bff5983df1ccf0e95ed929
Commit Graph

20475 Commits

Author SHA1 Message Date
Leshana
88c4ca0246 Fix light/camera layers for macros and fix constants for them too. 2018-04-01 16:29:52 -04:00
Leshana
07c0ef2b8a Fix unused variable warnings. 2018-04-01 16:17:35 -04: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
Neerti
9ff18723f4 Merge pull request #5128 from Atermonera/pai_mani 
Fixes #4951
 2018-03-29 23:21:15 -04:00
Neerti
f5c331b142 Merge pull request #5127 from VOREStation/vplk-table-layer-fixes 
Table Layering and Runtime Fixes
 2018-03-29 23:20:57 -04:00
Atermonera
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
Leshana
1ae7f45f1f Merge branch 'master' into vplk-port-pipeland-theta 2018-03-28 17:47:21 -04:00
elgeonmb
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
elgeonmb
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 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
Atermonera
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
Atermonera
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
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
Leshana
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
Arokha Sieyes
657e98f11c POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed 2018-03-25 17:01:32 -04:00
Arokha Sieyes
437d1d20cb POLARIS: Fixes #3270 (VS) - Cleanbots make noise too often, reduce chance 2018-03-25 17:01:18 -04:00
Arokha Sieyes
c4a6f8bae7 POLARIS: Fixes #3298 (VS) - Observer-ghosts were naked instead of dressed 2018-03-25 17:01:05 -04:00
Arokha Sieyes
7a02be8154 POLARIS: Fixes #3280 (VS) - Typing as ghost removes overlays 
Also gives them the proper ghost speech bubble. Unsure why it wasn't used!
 2018-03-25 17:00:37 -04:00
Arokha Sieyes
95877cc30a POLARIS: Fixes #3308 (VS) - Skrell lack eyes 2018-03-25 16:54:50 -04:00
Aronai Sieyes
5bfb23eafc Merge pull request #3324 from VOREStation/aro-promtweaks 
Promethean tweaks (hunger, regen time)
 2018-03-25 15:33:09 -04:00
Heroman3003
be17090547 (SQ-Merge) Possible fix for drop-nomming (#3331) 
* possible drop-nomming fix

* no longer 100% fall cushion on non-aligning prefs

* fixed some checks
 2018-03-25 15:32:12 -04:00
Aronai Sieyes
cce782335f Merge pull request #3333 from VOREStation/aro-protsize 
Some size stuff for Proteans
 2018-03-25 15:31:19 -04:00
Aronai Sieyes
7caed8fa39 Merge pull request #3340 from Screemonster/nstrikemaverick 
Balance pass on custom species traits
 2018-03-25 15:31:02 -04:00
Aronai Sieyes
3ad57706e0 Merge pull request #3343 from VOREStation/aro-cameras 
Fixes handheld cameras
 2018-03-25 15:30:24 -04:00
Aronai Sieyes
93c46fe3f0 Merge pull request #3347 from VOREStation/aro-promlimb 
Increase prom limb health by 60%
 2018-03-25 15:30:13 -04:00
lukevale
f0f8935bec (SQ-Merge) Adds in Floppy Bunny ears. (#3348) 2018-03-25 15:29:02 -04:00
Screemonster
5396d2e7e2 changes hairstyles to use species defines 2018-03-25 17:03:20 +01:00
Arokha Sieyes
98ca792b51 Increase prom limb health by 60% 2018-03-25 10:51:44 -04:00
Arokha Sieyes
7ece9d730f Fixes handheld cameras 2018-03-24 23:09:50 -04:00
Aronai Sieyes
e904582d94 Merge pull request #3334 from VOREStation/aro-gunstuff 
Removes a bunch of my unused fluff stuff
 2018-03-24 12:00:18 -04:00
Aronai Sieyes
700f7b23b7 Merge pull request #3300 from Verkister/bixelverb 
Adds a verb to switch tail layer.
 2018-03-24 11:50:30 -04:00
Aronai Sieyes
1b784cba6f Merge pull request #3321 from VOREStation/aro-fixniflogs 
Fix nif logs
 2018-03-24 11:49:03 -04:00
Aronai Sieyes
14c874764f Merge pull request #3329 from Verkister/robobutt 
Fixes default synth tails necessitating potentially harmful mystery delays in mannequin generation.
 2018-03-24 11:39:11 -04:00
Aronai Sieyes
3a6e43fbca Merge pull request #3338 from Verkister/patch-11 
Removes an inconsistency in custom species code
 2018-03-24 11:16:57 -04:00
Screemonster
217c7a655f Balance pass on custom species traits 2018-03-24 15:03:48 +00:00
Verkister
c93519f6e2 Couple security otie fixes 
-Fixes sec oties failing to announce arrests for sec comms.
-Adds another announcement for sec oties to confirm successfully detained crimester.
 2018-03-24 13:56:30 +02:00