cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,063 Commits 9 Branches 26 Tags
fc4c1d6af7bcb6029d4d8a901f1792c48e4d8529
Commit Graph
27063 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PsiOmegaDelta fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
PsiOmegaDelta af13c0d529 Merge pull request #11310 from Ccomp5950/pda_tap_tap_tappity_tap 
Fixes the tapping messages check.
 2015-10-16 08:20:53 +02:00
PsiOmegaDelta 62cbaa94a2 Merge pull request #11309 from Ccomp5950/fix_ai_holopad 
AI's can now use languages through holopads...
 2015-10-16 08:09:26 +02:00
ccomp5950 bb93245ccd Fixes the tapping messages check. 
The check is now in Topic() instead of being based on the href link sent.

Resolves #11039
 2015-10-15 21:11:06 -04:00
ccomp5950 111973ed5c AI's can now use languages through holopads... 
...and have it respect if the listener understands.

Resolves #11113 (AI's speech not timestamped through holopad)
Resolves #11183 (All languages can be understood when AI speaks them through a holopad.)
Resolves #6217  (pAIs cannot hear AI hologram speech)
 2015-10-15 19:56:45 -04:00
Chinsky 0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag 
Cleans up antag auto-spawning, adds checks for active antags
 2015-10-15 19:16:13 +03:00
Snapshot d75a146cc3 Merge pull request #11306 from mwerezak/sunglasses-loadout 
Fixes #11216
 2015-10-15 07:47:21 -07:00
mwerezak 7272deb5ae Fixes #11216 
Sunglass-derived custom gear is now only available to roles that normally have access to them.
 2015-10-15 06:58:25 -04:00
mwerezak 8398fce523 Merge pull request #11303 from PsiOmegaDelta/151015-SurgicalPackaging 
Surgical kits can now contain their equipment.
 2015-10-15 05:51:29 -04:00
mwerezak 484cbd5764 Merge pull request #11305 from PsiOmegaDelta/151015-Chemistry 
Chemistry machinery fixes.
 2015-10-15 05:48:45 -04:00
PsiOmegaDelta 2fcaaf80c7 Chemistry machinery fixes. 
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116. Fixes #11302.
 2015-10-15 11:31:57 +02:00
PsiOmegaDelta e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta fd03e4d59b Surgical kits can now contain their equipment. 
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
 2015-10-15 10:20:49 +02:00
HarpyEagle ffb26a6f87 Adds checks for antags being dead or SSD 2015-10-14 14:57:52 -04:00
mwerezak 21fada644d Merge pull request #11290 from PsiOmegaDelta/151013-LawLogging 
Fixes law change logging.
 2015-10-14 10:46:30 -04:00
PsiOmegaDelta 3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
PsiOmegaDelta 8426d52a73 Merge pull request #11293 from PsiOmegaDelta/master 
Updates changelog.
 2015-10-14 08:29:34 +02:00
PsiOmegaDelta e5ef8d5485 Updates changelog. 2015-10-14 08:22:28 +02:00
PsiOmegaDelta a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster 
Pointed secret changes to master
 2015-10-13 20:27:56 +02:00
PsiOmegaDelta d7b6784e28 Fixes law change logging. 
The "Show last X law changes" review window should now actually be useful, displaying AI law updates with time, user, and law change.
 2015-10-13 19:44:49 +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
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 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 608c766db2 Merge pull request #11279 from PsiOmegaDelta/151012-Ghostize 
ghostize() now attempts to set the most relevant time of death.
 2015-10-13 08:36:28 +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
mwerezak 46f5bbc1d4 Merge pull request #11277 from Hubblenaut/stacks 
Fixes stack creation logic and return value
 2015-10-12 11:25:51 -04:00
Hubblenaut ab5c5486e0 Update Changelog 2015-10-12 16:38:42 +02:00
PsiOmegaDelta 7d653d9e2e Merge pull request #11280 from Kelenius/borkbork 
Fixes a bork in life.dm
 2015-10-12 15:28:31 +02:00
Kelenius 741cb2d423 It was bork, I made it not bork 2015-10-12 13:57:47 +03:00
PsiOmegaDelta 7247906f41 ghostize() now attempts to set the most relevant time of death. 
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229.
 2015-10-12 12:55:34 +02:00
GinjaNinja32 de68e366f5 Merge pull request #11270 from Hubblenaut/master 
Flavor Text Bugfix
 2015-10-11 23:55:10 +01: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 5acd0eaab4 Merge pull request #11274 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-10-11 17:35:09 +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
Chinsky debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
Chinsky b1ec6e4281 Merge pull request #11267 from PsiOmegaDelta/151010-WarningSpaceAgainAvailable 
Fixes #11266.
 2015-10-10 17:50:56 +03:00
Hubblenaut cd182a3e1c Updates Changelog 2015-10-10 15:59:47 +02:00
Hubblenaut d3572bf4cb Fixes empty flavor text drawing two spaces 2015-10-10 15:55:25 +02:00
PsiOmegaDelta 210aabab33 Merge pull request #11269 from PsiOmegaDelta/151010-Changelog 
Updates changelog.
 2015-10-10 10:18:02 +02:00
PsiOmegaDelta 92ea0f6e9a Updates changelog. 2015-10-10 10:15:14 +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
GinjaNinja32 8b6118701f Merge pull request #11264 from mwerezak/ruptured-lung-fix 
Fixes #11262
 2015-10-10 09:04:51 +01:00