Commit Graph

19956 Commits

Author SHA1 Message Date
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
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
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
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
HarpyEagle
dec0629fae Renames latespawn() to be less confusing 2015-10-11 11:26:24 -04:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer
Fixes #11263.
2015-10-10 17:51:15 +03:00
Hubblenaut
d3572bf4cb Fixes empty flavor text drawing two spaces 2015-10-10 15:55:25 +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
fa86509daf Readds organ damage from failing to mend ribs 2015-10-09 18:57:17 -04:00
HarpyEagle
5684befee2 Fixes #11262 2015-10-09 18:57:17 -04:00
Hubblenaut
80cc83dbf8 Fixes backup power test light 2015-10-09 17:44:30 +02: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
PsiOmegaDelta
e237e33030 Merge pull request #11259 from mwerezak/rubber-bullets
Rubber bullets and beanbags now check melee armour instead of bullet armour
2015-10-09 12:42:44 +02:00
HarpyEagle
1cf6ace74e Fixes #11071, #10936
Adjusts fire_fuel_energy_release to compensate for fixed fire heat release.
Adjusts liquid fire burn parameters so that liquid fuel fire heat release and
burn duration is unaffected.
2015-10-09 01:19:15 -04:00
HarpyEagle
9639d608a6 Fixes calculate_firelevel() not counting oxidizer
Fixes calculate_firelevel() not counting oxidizer when determining the ratio
of reactants to other gases. As well firelevel calculation is now done
separately for burning gas and burning liquid.

Adjusted FIRE_LIQUID_BURNRATE_MULT so that liquid burn rate is unaffected by
this fix, which will result in generally higher firelevels and thus faster
burn rates.
2015-10-08 23:40:08 -04: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
40ab99b354 Rubber bullets and beanbags now check melee armour instead of bullet armour 2015-10-08 16:36:51 -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
Chinsky
f47a58e23e Merge pull request #11244 from Kelenius/hackMe
Basic encryption hack popup only shows suitable APCs
2015-10-06 20:29:51 +03:00
Chinsky
8107786cbd Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech
Makes silicon language handling more robust.
2015-10-06 19:32:54 +03:00
Chinsky
c7070dd7f7 Merge pull request #11251 from PsiOmegaDelta/151006-JobReport
Antagonist summary printout now prefers assignment over special role.
2015-10-06 19:26:42 +03:00
PsiOmegaDelta
ec097d928a Antagonist summary printout now prefers assignment over special role.
As antags are listed under relevant headings, i.e. "The traitors were", this seems more reasonable. Fixes #10817.
2015-10-06 09:19:40 +02:00
HarpyEagle
74950268d7 Fixes fire_stacks update logic 2015-10-05 19:24:33 -04:00
PsiOmegaDelta
bbcadcc080 Makes silicon language handling more robust.
Also fixes an issue with lists being targets for qdel(). Fixes #11221.
2015-10-05 11:21:09 +02:00
Kelenius
f3effa8df7 Basic encryption hack popup only shows suitable APCs 2015-10-05 11:40:19 +03:00
PsiOmegaDelta
91faf8555f Antag placement now favors mobless turfs.
If one such turf is available, otherwise picks a random populated turf. Fixes #11237.
2015-10-05 10:13:05 +02:00
GinjaNinja32
5ef5f40cbe add 'info' topic command to get information on a character 2015-10-02 12:45:19 +01:00