cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 02:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,708 Commits 8 Branches 26 Tags
e08cbef04450ffa45500b499850584bbe0dbff6d
Commit Graph

20503 Commits

Author SHA1 Message Date
Leshana
e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 
# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
 2018-04-06 15:40:06 -04:00
Aronai Sieyes
dc3a587b7f Merge pull request #3390 from Verkister/collors 
Small Shock/Holo collar tweaks.
 2018-04-06 15:11:16 -04:00
Leshana
c8dd30846c Merge pull request #3378 from VOREStation/polaris-sync-2018-03-30 
Polaris Sync 2018-03-30
 2018-04-06 14:42:19 -04:00
Verkister
5d8b6cd1a6 Small Shock/Holo collar tweaks. 
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.
 2018-04-05 15:48:03 +03:00
Atermonera
d5c5249327 Merge pull request #5147 from VOREStation/vplk-atmos-layers 
Switch cables and pipes to use define constants instead of literals for layers.
 2018-04-04 17:42:36 -07:00
Atermonera
a6ebe9b44a Merge pull request #5145 from VOREStation/vs-port-3058 
[PORT] Halve character-join lag
 2018-04-04 17:38:31 -07:00
Leshana
8c3e41a705 Small fixes and ports discovered during merge. (#5138) 
* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.
 2018-04-04 17:35:15 -07:00
Leshana
7da46a6dcc Switch cables and pipes to use define constants instead of literals for layers. 
Also fix a few things to be on the correct plane.  Basically the under-floor stuff is supposed to be on PLATING_PLANE.
Portable atmospherics go on object layer so they are above stationary machinery, given that they move around.
Fixed wires to be on top of pipes like they used to be, otherwise they'd be obscured too often.
 2018-04-02 21:50:03 -04:00
Arokha Sieyes
0e2f41ea86 More optimizations for character joins 2018-04-02 16:49:44 -04:00
Arokha Sieyes
a6cfbc4f42 Initial cleanup/changes 2018-04-02 16:36:04 -04:00
MarinaGryphon
6cb7d9a10c Fixes wallet-HUD interaction issues. (#5130) 
* Fixes wallet-HUD interaction issues.

* Fixes HUDs, too. Forgot to commit this the first time. Also hopefully didn't change the map to examplemap.

* Fixes an indentation error.
 2018-04-01 22:46:13 -05:00
Anewbe
86285d305a Merge pull request #5131 from Neerti/3/30/2018_poi_grouping 
Adds Map Template Groups
 2018-04-01 22:45:18 -05:00
Leshana
666215bae8 Merge pull request #3369 from VOREStation/aro-posiempty 
Fixes infinite loop in FBP naming w/o client
 2018-04-01 19:17:38 -04:00
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
Neerti
183a567db0 Merge pull request #5059 from Heroman3003/slime-behavior-fixes 
Fixes and tweaks for slime behavior.
 2018-03-31 23:35:24 -04:00
Atermonera
d49ac27d7f Merge pull request #5102 from Verkister/orgons 
Fixes inconsistencies in organ system
 2018-03-31 12:15:51 -07:00
Atermonera
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
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
Anewbe
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
Anewbe
6caa8e08cf Merge pull request #5113 from Woodratt/03262018_44revolver 
44 revolvers
 2018-03-30 17:46:37 -05:00
Neerti
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
Arokha Sieyes
794185d3f2 Fixes infinite loop in FBP naming w/o client 2018-03-29 23:46:19 -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
e14140d8dc Grant remote profile access to R_DEBUG holders 2018-03-29 13:52:53 -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
5a4a154248 Probably maybe fixes blank lines for prey 2018-03-27 20:22:40 -04: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
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