Commit Graph

21229 Commits

Author SHA1 Message Date
Hubblenaut
d3572bf4cb Fixes empty flavor text drawing two spaces 2015-10-10 15:55:25 +02: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
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
Hubblenaut
ba19c28c33 Adds laundry basket 2015-10-09 17:03:41 +02: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
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
1f1857cc0a Merge pull request #11257 from Karolis2011/map_capture
Added more help/error messages to the capture tool.
2015-10-09 11:35:54 +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
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
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
mwerezak
83df0fa8f8 Makes powercells produced by the protolathe start uncharged. 2015-10-08 15:10: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
Karolis2011
fad0e0b28a Added more help/error messages to the tool. 2015-10-08 12:36:09 +03:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo
Updates blob
2015-10-08 07:58:15 +02:00
Kelenius
82928d3b74 Fixes a minor blob issue, adds mecha attack message 2015-10-07 10:49:24 +03:00
PsiOmegaDelta
55c9f7533b Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name. 2015-10-07 08:56:13 +02:00
PsiOmegaDelta
aaba2c5c8c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
Hubblenaut
a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +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
5a83cdaa75 Merge pull request #11252 from PsiOmegaDelta/151006-HUDPositioning
Relative HUD element positioning.
2015-10-06 19:32:04 +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
019c147bdc HUD element positioning.
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).

Port of https://github.com/d3athrow/vgstation13/pull/5984.
2015-10-06 12:51:03 +02: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
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04: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
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
PsiOmegaDelta
f3175becc0 Overhauls humanoid vision handling.
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
2015-10-05 08:48:47 +02:00
PsiOmegaDelta
f249bf3bcc Compilation fixes. 2015-10-04 17:48:41 +02:00
PsiOmegaDelta
96a90bb5e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-10-04 17:41:02 +02:00
PsiOmegaDelta
f4be4c0ad9 Merge pull request #11238 from Baystation12/master
Dev-freeze
2015-10-04 17:31:44 +02:00
Hubblenaut
8f7d108831 Ctrl+Click deflates inflatables 2015-10-04 15:56:45 +02:00
GinjaNinja32
5ef5f40cbe add 'info' topic command to get information on a character 2015-10-02 12:45:19 +01:00
Vivalas
0bf5145e24 Name change 2015-10-01 13:35:26 -05:00
PsiOmegaDelta
a3a1f495a3 Implements my own comment suggestions and updates Travis' macro count. 2015-10-01 09:56:30 +02:00
PsiOmegaDelta
8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	baystation12.dme
2015-10-01 09:48:51 +02:00