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

9255 Commits

Author SHA1 Message Date
Aronai Sieyes
dc7cefdd0d Merge pull request #3421 from VOREStation/aro-protwork 
Some protean fixes (regen, size as blob, gender)
 2018-04-10 18:19:32 -04:00
Arokha Sieyes
82c05428e1 Some protean fixes (regen, size as blob, gender) 2018-04-10 18:10:14 -04:00
Spades
24217b12a8 Merge pull request #3389 from Verkister/mobvors 
Fixes resting and vore icon issues with mobs and silicons
 2018-04-10 14:44:36 -04:00
Verkister
5e0ed0585f done 2018-04-09 23:40:20 +03:00
Leshana
98d5f62250 Merge pull request #3400 from VOREStation/polaris-sync-2018-04-04 
Polaris Sync 2018-04-04
 2018-04-09 13:28:19 -04:00
Arokha Sieyes
d67f433f22 Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe 2018-04-08 22:00:10 -04:00
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
2f8063c560 Merge pull request #3380 from Ketrai/patch-8 
Nerfs solargrub drain speed.
 2018-04-06 15:34:44 -04:00
Ketrai
26d028a16f Update solargrub.dm 2018-04-06 11:40:26 +02:00
Verkister
04a6d1a4b0 more fixes etc 2018-04-06 10:48:38 +03:00
Verkister
4a81fcf8d8 Fixes a bunch of simple animal vore icon issues. 2018-04-05 09:59:24 +03: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
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
Ketrai
9cac16375a Nerfs solargrub drain speed. 
Due to the lack of saturation in the moderate event container, solargrubs show up way too frequently, and changing the frequency doesn't help. The container has to pick. This change will just bump the drain speed down so severely, that if you kill one or two grubs, the station should barely feel the impact anymore. As opposed to having to kill 4/5 grubs on average.

Gradual nerfs seem logical, as grubs get more and mroe of a day-to-day experience, and most people know about them now. Time to stop the witch hunting for those annoying grubs :p
 2018-04-02 12:19:26 +02: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
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
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
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
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
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
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
Leshana
d738e99d2f POLARIS: Fix holders to avoid forcemoving held mob to nullspace 2018-03-25 17:08:29 -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
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
Aronai Sieyes
5bfb23eafc Merge pull request #3324 from VOREStation/aro-promtweaks 
Promethean tweaks (hunger, regen time)
 2018-03-25 15:33:09 -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
Screemonster
5396d2e7e2 changes hairstyles to use species defines 2018-03-25 17:03:20 +01: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
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
Verkister
40efe1d50b Re-establishes existing foundations for human icon 
This line had no real use at all that I could find. It may even have contributed to various issues.
Before this line was added, all basic humanoid species have had their appearances constructed onto an actually existing blank 32x32 icon_state named and called for as "nothing" inside the effects.dmi.
There are no untitled blanks either inside the effects.dmi file, so the funky deviant species specific icon_states would never have had any proper fallback either.

No negative effects whatsoever detected in testing runs. Maybe slight framerate increase, but that was likely unrelated/placebo lmao
 2018-03-24 12:10:47 +02:00
Verkister
ddef1f29b8 Removes an inconsistency in custom species code 
This line had no real use at all. It may even have contributed to various issues.
All basic humanoid species have had their appearances constructed onto an existing blank 32x32 icon_state named and called for as "nothing" inside the effects.dmi.
There are no untitled blanks either inside the effects.dmi file, so the funky deviant custom species icon_states would never have had any proper fallback.
 2018-03-24 11:33:47 +02:00
Anewbe
9a7f8b1953 Merge pull request #5093 from Neerti/3/21/2018_typing_fix 
Cherrypicks missing typing indicator commit from Virgo
 2018-03-23 21:40:00 -05:00