Commit Graph

19865 Commits

Author SHA1 Message Date
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
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
SomeoneElse
7e4191d212 [minor] Fix ATM transfer code, remove badly placed 'break'.
code/modules/economy/Accounts.dm:
	remove break from charge_to_account()
2015-09-11 16:44:00 +06:00
mwerezak
196c0db87f Merge branch 'master' into abandonedcrates 2015-09-11 00:56:33 -04:00
mwerezak
b9ee4ebc5e Merge branch 'master' into abandonedcrates 2015-09-10 15:21:15 -04:00
Vivalas
ae5810d6ed Fixes #10729 2015-09-10 13:50:24 -05:00
PsiOmegaDelta
9857961509 Merge branch 'master' into 150909-DelQdel 2015-09-10 07:05:09 +02:00
PsiOmegaDelta
8b36433c50 Merge branch 'master' into 150909-DelQdel 2015-09-10 06:48:05 +02:00
mwerezak
67fd31bd3e Abandoned crates now again use unique digits for their codes 2015-09-10 00:42:14 -04:00
mwerezak
f69c723d40 Made flares a bit brighter 2015-09-09 20:42:40 -04:00
mwerezak
4c74b916ce Merge branch 'master' into do_mob-fix 2015-09-09 16:07:32 -04:00
mwerezak
124609ad71 Fixes various actions occuring instantly
Feeding food/drinks in particular.
2015-09-09 16:04:59 -04:00
PsiOmegaDelta
2007004f3c Qdel cleanup.
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
mwerezak
cfa82e0c5e Allows resisting while restrained, prevents stop-drop-and-roll while buckled. 2015-09-09 03:11:09 -04:00
mwerezak
5e478b58e8 Fixes #10746
Stumps can now be amputated, but not removed by taking damage.
2015-09-09 00:17:37 -04:00
PsiOmegaDelta
30069d1dce Merge pull request #11044 from Kelenius/beepskyFixes
Makes beepsky less brutal
2015-09-08 10:41:30 +02:00
Kelenius
388159c7f1 Makes beepsky less brutal
Fixes #10979
Fixes beepsky beating up handcuffed people
2015-09-08 11:36:55 +03:00
PsiOmega
0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr
412ee32d1c Stops autotraitor grabbing minds from the lobby for antag roles. 2015-09-07 17:01:34 +09:30
GinjaNinja32
4b73518d49 Merge pull request #11036 from PsiOmegaDelta/150907-AlwaysDoItYourself
Re-adds recharge station checks.
2015-09-07 07:19:50 +01:00
PsiOmega
8e9705b6c7 Re-adds recharge station checks.
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
2015-09-07 08:16:31 +02:00
Zuhayr
211e426009 Tweak. 2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50 Fixes #10951 2015-09-07 14:43:12 +09:30
Zuhayr
88b95e1207 Fixes #7951 2015-09-07 14:40:23 +09:30
Zuhayr
43a349ee2a Fixes #11022 2015-09-07 14:25:45 +09:30
Zuhayr
dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Chinsky
9533f2d154 Merge pull request #11026 from GinjaNinja32/announcement
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
Chinsky
47f382b892 Merge pull request #11027 from Datraen/master
[BOTANY] Fixes plant nutrient storage unit check
2015-09-07 01:02:21 +03:00
Datraen
05a29f8f3a [BOTANY] Fixes plant storage nutrient check
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
GinjaNinja32
5a335c9140 Improve formatting of admin announcements 2015-09-06 20:41:06 +01:00
PsiOmega
cc960624b9 Fixes mercenary mode not listing bought items.
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
Chinsky
d99c4ffaaa Merge pull request #11021 from Zuhayr/antagsystem
Forgot a couple of tweaks.
2015-09-06 08:06:48 +03:00
Zuhayr
eacc1e7da7 Tweaks. 2015-09-06 11:19:54 +09:30
GinjaNinja32
3bb0e2503a Merge pull request #11020 from Zuhayr/antagsystem
More antag fixes.
2015-09-06 02:47:12 +01:00
Zuhayr
111ff96312 Should fix antag candidate selection. 2015-09-06 10:59:59 +09:30
Zuhayr
efa995b372 Should fix antag scaling. 2015-09-06 10:53:32 +09:30
Samuel Novák
12a0bae5bd Stop resting when pAI chassis collapses 2015-09-05 21:53:21 +02:00
GinjaNinja32
8685ff42a4 Merge pull request #11008 from Zuhayr/antaghud
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 17:01:57 +01:00
GinjaNinja32
0ae3b1dd0c Merge pull request #11013 from PsiOmegaDelta/150905-ShieldCrush
Hull shields should no longer prevent the departure shuttle from leaving
2015-09-05 16:59:58 +01:00
GinjaNinja32
71b2213233 Merge pull request #11009 from PsiOmegaDelta/150905-JustGoAwayAlready
Status display alarms now clear properly on all mode changes.
2015-09-05 16:59:52 +01:00
GinjaNinja32
ef208a55aa Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents
Vent crawling now explicitly checks for equipped items.
2015-09-05 16:59:33 +01:00
PsiOmega
5ae74883d2 Hull shields should no longer prevent the departure shuttle from leaving.
If hull shields are left alone by the crew (due to being, for example, all dead) the departure shuttle is unable to leave.
This should destroy any shields faster than they can regenerate, thus ensuring a safe and pleasant departure.
2015-09-05 16:49:15 +02:00
PsiOmega
d77f0f3997 Status display alarms now clear properly on all mode changes.
Previously one had to first set the display mode to Clear before the overlays would go away.
This corrects situations where, for example, the emergency shuttle ETA could be covered by a NT logo.
2015-09-05 12:02:17 +02:00
Zuhayr
b09e836d95 Removed an unused file. 2015-09-05 18:51:39 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
Zuhayr
89a7c9667b Reverts a testing value. 2015-09-05 17:31:27 +09:30
GinjaNinja32
8311e06d2b Merge pull request #11003 from Zuhayr/secretfix
Fixes Secret.
2015-09-05 07:17:47 +01:00