cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-09 15:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,811 Commits 8 Branches 26 Tags
e41131368b0f3fa4ebdbbffe724537a0caa674d8
Commit Graph

3023 Commits

Author SHA1 Message Date
PsiOmegaDelta
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
38c6ba3a07 Code relocation. 2015-10-11 17:31:21 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
PsiOmegaDelta
fd3370c01f Fixes #11263. 
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
 2015-10-10 10:11:48 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
GinjaNinja32
ace1874f37 Merge pull request #11241 from Hubblenaut/light_replacer 
Amendments to light replacer
 2015-10-09 11:35:13 +01:00
HarpyEagle
fa661f998f TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
 2015-10-08 23:26:05 -04:00
PsiOmegaDelta
bd7c475fcc Stack material use now depends on charge costs. 
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
 2015-10-08 20:29:39 +02:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo 
Updates blob
 2015-10-08 07:58:15 +02:00
Hubblenaut
a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +02:00
Kelenius
83adba88d4 Updates blob 
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
 2015-10-05 18:10:16 +03:00
Zuhayr
e8196675e0 Merge pull request #11228 from Vivalas/dev 
Adds in AcmeCo brand explosive cigarettes.
 2015-10-06 00:42:43 +10:30
Vivalas
0bf5145e24 Name change 2015-10-01 13:35:26 -05:00
Vivalas
d2c355a937 Adds in KillerKickthroats 2015-09-30 17:56:35 -05:00
Vivalas
8b6650d217 Briefcase Fix 2015-09-30 17:10:57 -05:00
mwerezak
03cb79a85d Merge pull request #11187 from PsiOmegaDelta/150925-Destruction 
Destroy tweaks.
 2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity 
Makes more sources of radiation respect rad-protection.
 2015-09-26 20:10:47 -05:00
PsiOmega
a3b9ab1236 Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection. 2015-09-26 09:19:58 +02:00
Chinsky
dbbf6bb11e Merge pull request #11158 from PsiOmegaDelta/150920-MoreGlow 
Glowy items.
 2015-09-25 15:03:39 +03:00
Chinsky
407f5bbac3 Merge pull request #11182 from Hubblenaut/dev 
Lowers the belt layer to below suit
 2015-09-25 11:45:57 +03:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-09-25 10:44:23 +02:00
Hubblenaut
8d3519e24b Belt layer below suit layer, belts toggleable 2015-09-24 17:48:14 +02:00
Chinsky
60a925422f Merge pull request #11167 from PsiOmegaDelta/150921-ColorCleanup 
Floor painter, turf, and decal tweaks.
 2015-09-24 15:27:58 +03:00
PsiOmega
de2e9e2d9a Odd typo fixes. 2015-09-21 20:31:47 +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
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable 
Species tweaks
 2015-09-21 19:08:53 +09:30
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
PsiOmegaDelta
59c5807157 Active stunbatons now glow. 2015-09-19 21:12:19 +02: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
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03: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
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
mwerezak
f69c723d40 Made flares a bit brighter 2015-09-09 20:42:40 -04:00
mwerezak
8e66d3b31a Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon 
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
 2015-09-09 19:49:46 -04:00
PsiOmegaDelta
cbd621ae41 Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses 2015-09-09 08:18:26 +02:00
PsiOmegaDelta
6a956d0d0a Uplink fixes. 
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
 2015-09-08 08:43:40 +02:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +02:00