cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 14:19:43 +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
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
mwerezak
f245e41db2 Merge pull request #11287 from PsiOmegaDelta/151013-TopicFingerprints 
Changes how Topic() calls apply fingerprints.
 2015-10-13 22:11:26 -04:00
Chinsky
8c8b5a34d3 Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob 
Blob spawn locations are now more random
 2015-10-14 03:24:28 +03:00
PsiOmegaDelta
a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster 
Pointed secret changes to master
 2015-10-13 20:27:56 +02:00
Kearel
78956843a8 Pointed secret changes to master 
New gamemodes on dev will still need to be changed.
 2015-10-13 12:30:52 -05:00
PsiOmegaDelta
3b5990121f Blobs locations are now more random. 
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
 2015-10-13 18:49:55 +02:00
GinjaNinja32
c6f328159c Merge pull request #11286 from PsiOmegaDelta/151013-SillyMistake 
Antag spawner now uses the starting location list...
 2015-10-13 08:04:21 +01:00
PsiOmegaDelta
cfc01d053b Changes how Topic() calls apply fingerprints. 
Now applies fingerprints if the user is adjacent to a physical object, otherwise applies a hidden fingerprint.
CouldUseTopic() is only called when a user has successfully interacted with an object interface/UI.
 2015-10-13 08:56:20 +02:00
PsiOmegaDelta
f0244bc9e5 Antag spawner now uses the starting location list... 
..instead of the mob. Someone (might just maybe potentially be me, who knows) cleaned up the code a bit too quickly. Fixes #11284.
 2015-10-13 08:09:12 +02:00
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
HarpyEagle
c0dc32d60c If an antag could not be auto-spawned, the game rechecks in the minimum time. 2015-10-12 13:03:51 -04:00
HarpyEagle
241520f0bb Cleans up autospawn, now uses existing code for selecting and choosing 
candidates. Adds more debug messages, and removes unused code.
 2015-10-12 13:03:50 -04:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
HarpyEagle
e381e2faf2 Fixes do_not_announce parameters not actually doing anything 2015-10-11 12:18:01 -04:00
HarpyEagle
c7afded12d Cleans up calamity shuffle, makes sure antag types are selected in a random order for other game modes. 2015-10-11 12:18:01 -04:00
HarpyEagle
d715e0645f Removes unused latejoin template list 2015-10-11 12:02:04 -04:00
HarpyEagle
43d5f2e3bd Ensures leftover candidates and pending antags are cleared after finalizing 2015-10-11 11:39:26 -04: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
HarpyEagle
dec0629fae Renames latespawn() to be less confusing 2015-10-11 11:26:24 -04: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
SinTwo
ec58f7c705 TG_Port 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
 2015-10-11 00:58:26 -04:00
Neerti
24d9545790 Headset/shield issues. 2015-10-11 00:54:01 -04:00
Mark9013100
64ccad7790 Fixes #77 2015-10-11 00:45:27 -04:00
Mark9013100
a2c8e3ee10 Minor edits to the sec lockers 
Conflicts:
	maps/colony-1.dmm
 2015-10-11 00:45:22 -04:00
Mark9013100
1273a51f83 Merges f-card box and evidence bag box 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2015-10-11 00:41:46 -04:00
Datraen
d0bd6b8857 [BUG FIX] Wardrobe 
Socks are now able to be changed from the wardrobe
 2015-10-11 00:40:54 -04:00
Mark9013100
fb1134a24b Changes several helmets, fixes shields 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/modules/clothing/head/helmet.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-10-11 00:39:38 -04:00
SinTwo
4129b95f4e TG_PORT_fix 2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/suits/miscellaneous.dm
 2015-10-11 00:36:50 -04:00
SinTwo
a2b24d64b7 TG_Port_2 
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
 2015-10-11 00:36:13 -04:00
Mark9013100
1eab12fc26 Two minor edits to ERT equipment 2015-10-11 00:30:10 -04:00
Mark9013100
3cc7a77846 The detective colt can now be reskinned 
Conflicts:
	code/modules/projectiles/guns/projectile/pistol.dm
 2015-10-11 00:30:06 -04:00
Mark9013100
2d709e7862 Flares now spawn in sec lockers 2015-10-11 00:28:47 -04:00
Jon
9f2ec9c163 Adds three new hair flower pins - yellow, blue, and pink. 
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
 2015-10-11 00:26:54 -04:00
Neerti
6740dea5ad Update Space Station 13 areas.dm 
Conflicts:
	code/game/area/Space Station 13 areas.dm
 2015-10-11 00:26:23 -04:00
Neerti
bbe8c336b2 Adds socks. 
Conflicts:
	code/modules/client/preferences_savefile.dm
 2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
 2015-10-10 12:05:36 +02: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
HarpyEagle
6c3bbb9ee8 Updates changelog, fixes comment 2015-10-09 11:39:22 -04:00
HarpyEagle
63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
Hubblenaut
ba19c28c33 Adds laundry basket 2015-10-09 17:03:41 +02:00
PsiOmegaDelta
4ca487e291 Merge pull request #10113 from mwerezak/wheredoesthepowercomefrom 
Makes newly fabricated power cells start uncharged
 2015-10-09 12:42:22 +02: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
HarpyEagle
38775120d7 Updates mechfab 
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
 2015-10-08 16:03:32 -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