cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 23:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 8 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

11085 Commits

Author SHA1 Message Date
PsiOmega
de2e9e2d9a Odd typo fixes. 2015-09-21 20:31:47 +02:00
PsiOmega
38c0251b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-21 17:35:49 +02:00
PsiOmega
5b4c7340e4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-21 17:26:19 +02:00
Daranz
ebaa452c4c Fix spelling: 'its' in place of 'it's' 2015-09-21 15:37:22 +02:00
PsiOmegaDelta
8a1b414e28 Floor painter, turf, and decal tweaks. 
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
 2015-09-21 15:14:13 +02:00
Zuhayr
a985e036f0 Minor cleanup. 2015-09-21 20:43:53 +09:30
Zuhayr
d37bf5fe2f Updating to new dev antagonist code. 2015-09-21 20:38:19 +09:30
Zuhayr
bfe1d5a599 Span classes. 2015-09-21 20:36:51 +09:30
Zuhayr
22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30
Zuhayr
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable 
Species tweaks
 2015-09-21 19:08:53 +09:30
Chinsky
02661be540 Merge pull request #11136 from PsiOmegaDelta/150918-BiasedMeteors 
Meteor events are now direction biased.
 2015-09-21 11:54:10 +03:00
Chinsky
5243626724 Merge pull request #11157 from PsiOmegaDelta/150920-ThunderdomeExclamationmark 
Map tweaks.
 2015-09-21 11:49:47 +03:00
Hubblenaut
ced4ce268c Adds Syndicate ID sprite 2015-09-20 21:11:49 +02:00
PsiOmegaDelta
4cc2b1a93e Glowy items. 
Energy shields now glows slightly stronger than stunbatons when active.
 2015-09-20 18:18:19 +02:00
PsiOmegaDelta
7d975aa36f Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-09-20 17:59:57 +02:00
PsiOmegaDelta
d891fba1cc Mob size tweaks. 
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
 2015-09-20 17:12:07 +02:00
Chinsky
6103f688cf Merge pull request #11143 from PsiOmegaDelta/150919-GlowyThings 
More glowy stuff.
 2015-09-20 04:51:01 +03:00
PsiOmegaDelta
bd3b4c5d81 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-19 21:37:05 +02:00
PsiOmegaDelta
59c5807157 Active stunbatons now glow. 2015-09-19 21:12:19 +02:00
Hubblenaut
4eef7ab65d Fixes beds occasionally buckling in odd directions 2015-09-19 15:27:24 +02:00
PsiOmegaDelta
d65ebf8b90 Meteor events are now direction biased. 
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
 2015-09-18 21:45:15 +02:00
PsiOmegaDelta
2d01a06f00 Corrects world-edge math. 
Meteors coming from the east would immediately be transfered to another Z-level and deleted, due to being considered outside the Z-level transition border.
 2015-09-18 15:23:18 +02:00
PsiOmegaDelta
232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
 2015-09-18 08:51:10 +02:00
PsiOmegaDelta
9946c837e4 Merge pull request #11134 from Baystation12/master 
Dev-freeze
 2015-09-18 08:50:11 +02:00
Zuhayr
1d7150ecd6 Merge pull request #11127 from PsiOmegaDelta/150917-MassiveNumberofMeteors 
Meteors no longer impact with each other.
 2015-09-18 14:34:14 +09:30
PsiOmegaDelta
dcc4655026 Merge pull request #11112 from caelaislinn/missing_spawn 
QOL feature for mappers
 2015-09-17 21:11:52 +02:00
PsiOmegaDelta
0e4f51413b Merge pull request #11074 from GinjaNinja32/title 
Title screen update
 2015-09-17 21:11:31 +02:00
PsiOmegaDelta
eb2151c118 Meteors no longer impact with each other. 
This increases the number of meteors which survive to reach the station, as there is some tendency for them to spawn on the same location (but not necessarily fly in the same direction).
 2015-09-17 09:08:09 +02:00
Chinsky
412380c3ab Merge pull request #11110 from GinjaNinja32/cleaning 
fix #11061
 2015-09-17 05:43:11 +03:00
PsiOmegaDelta
7ce27f76fd Macro refactoring. 
Turns several of the is* procs into istype defines.
 2015-09-16 12:57:14 +02:00
Cael Aislinn
00c9402656 enables spawning at latejoin landmarks instead of space if unable to find appropriate job spawn landmark 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-09-16 12:48:37 +10:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
GinjaNinja32
6a61269edd Merge pull request #11106 from Kelenius/jetpackFixes 
Fixes for jetpacks and gas tanks
 2015-09-15 15:06:58 +01:00
GinjaNinja32
52b51a6be4 fix #11061 2015-09-15 13:24:11 +01:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
mwerezak
db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair 
Converts some loc = to forceMove()
 2015-09-14 12:11:09 -04:00
Kelenius
3c4369823f Fixes for jetpacks 
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
 2015-09-14 16:35:52 +03:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove() 
Fixes #11102.
 2015-09-14 11:13:15 +02:00
PsiOmega
98175214d6 Attempts to improve mob in view acquirement. 
Creates a central proc that can (and will be) re-used.
This proc is hopefully more expandable by utilizing proc overrides.
It is now 1 instead of 3 loops (made even worse by the fact that each individual loop would re-acquire targets in view).
 2015-09-13 14:32:49 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
 2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
 2015-09-13 10:44:06 +02:00
PsiOmega
0c21ef741e Fixes #10988. 
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926.
 2015-09-12 20:43:24 +02:00
GinjaNinja32
c014866ac9 Remove unneccessary /area/start definition 2015-09-12 08:46:50 +01:00
GinjaNinja32
30782cde8f Remove the need to map in the title screen, move title screen icons into a single file 2015-09-12 08:34:28 +01:00
mwerezak
26f1d02bda Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-09-11 18:13:14 -04:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
Vivalas
ae5810d6ed Fixes #10729 2015-09-10 13:50:24 -05:00