Commit Graph

9739 Commits

Author SHA1 Message Date
Zuhayr
aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Loganbacca
492c5382e6 Fixes item anchoring on unload 2015-01-20 13:39:01 +13:00
Ccomp5950
d836103b22 Merge pull request #7860 from mwerezak/unarmed
Unarmed attack log message tweaks
2015-01-18 17:42:47 -05:00
mwerezak
15c7ed92e4 Unarmed message tweaks 2015-01-17 03:26:19 -05:00
Zuhayr
bf1544c141 Merge pull request #7849 from PsiOmegaDelta/RenameAI
Fixes #7644.
2015-01-16 23:15:12 +10:30
Zuhayr
c467e99f15 Merge pull request #7848 from comma/master
Moar fix
2015-01-16 23:13:53 +10:30
Chinsky
6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
d42482c7cc Fixes #7259
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
PsiOmega
02581042d7 Fixes #7644.
Makes it possible for admins to properly rename AIs, either by right-clicking the relevant AI or by using the verb in the Admin panel.
2015-01-16 11:23:08 +01:00
Chinsky
facfc0df56 Fixes #7560 2015-01-16 12:51:46 +03:00
Chinsky
b405fcd71f Fixes #7775 2015-01-16 12:26:05 +03:00
Chinsky
ac20d0b23b Fixes #7827 2015-01-16 12:19:53 +03:00
Chinsky
c2b5c53092 Merge pull request #7845 from Ravensdale/runtimeFixes
Fixes Cannot execute null.on removed()
2015-01-16 11:22:47 +03:00
Chinsky
46264e0194 Merge pull request #7838 from PsiOmegaDelta/EventFixes
Fixes  #7547.
2015-01-16 11:22:19 +03:00
Chinsky
badefe24d5 Merge pull request #7833 from PsiOmegaDelta/TrulyInvisible
Can no longer see the AI eye by right or alt-clicking turfs.
2015-01-16 11:22:09 +03:00
Ravensdale
fdf9886053 Fixes Cannot execute null.on removed() 2015-01-15 14:48:04 -08:00
Zuhayr
7a68bf0fc6 Merge pull request #7839 from comma/master
Hacky fixes
2015-01-16 08:53:04 +10:30
Chinsky
b4840aec54 Merge pull request #7616 from atlantiscze/boomfix
Wireless Wires Bugfix
2015-01-15 23:57:37 +03:00
Chinsky
0a7185c20a Fixes #7787
Made clean surgical amputation not cause huge wounds. Also moved code around a bit to prevent situations where missing limbs would get wounds (ie hands giving wounds to arms during recursive droplimb).
2015-01-15 18:59:39 +03:00
Chinsky
6f8618ded8 Fixes surgery steps never failing 2015-01-15 18:04:10 +03:00
Chinsky
47e5e51db3 Fix for the fix. 2015-01-15 17:51:45 +03:00
PsiOmega
2a9955c68b Fixes #7547.
The event manager now respects the "allow random event" config setting.
2015-01-15 15:01:38 +01:00
Chinsky
1c772e9914 Fixes #7821 2015-01-15 16:45:45 +03:00
Zuhayr
8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
PsiOmega
5c6c65e728 Can no longer see the AI eye by right or alt-clicking turfs. 2015-01-15 10:25:49 +01:00
Chinsky
d1480dc6d8 Merge pull request #7816 from Loganbacca/freezefix
SMES UI fix
2015-01-15 11:31:10 +03:00
Chinsky
34b99d02ef Merge pull request #7826 from mwerezak/jumpsuit
Fixes body_parts_covered not updating when rolling jumpsuits
2015-01-15 11:31:06 +03:00
Chinsky
f57f3147b4 Merge pull request #7829 from Loganbacca/hudfix
Fixes
2015-01-15 11:31:03 +03:00
Loganbacca
5fc035bffc Ghost labeller fix
No you cant stick labels on ghosts
2015-01-15 21:21:13 +13:00
mwerezak
812b9d3348 Fixes body_parts_covered not updating when rolling jumpsuits 2015-01-14 22:38:52 -05:00
Loganbacca
f711e3b24c Removed unnecessary check 2015-01-15 15:35:45 +13:00
Chinsky
45a35ced8e Merge pull request #7772 from mwerezak/events
Moderate level event weightings and balance
2015-01-14 18:56:06 +03:00
Loganbacca
f479ba9212 SMES UI tweak
Switching this to mirror output switching as in the last commit
2015-01-14 22:03:29 +13:00
Loganbacca
66ae9f4aac SMES UI fix
- Changed SMES NanoUI Online/Offline switch to reflect the current state
it is set to
- UI now also displays it's output status:
- Outputting = SMES is switched online and outputting normally
- Not Outputting = SMES is switched to offline
- Stored energy too low = SMES is set to online but can't output because
it doesn't have enough charge
2015-01-14 20:45:20 +13:00
Ravensdale
807348b814 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into runtimeFixes 2015-01-13 13:41:32 -08:00
Ravensdale
759373ac0a Fixes runtime with hand labelers 2015-01-13 09:52:14 -08:00
Loganbacca
cac7f64fdc Robot module fix
Thanks mwerezak
2015-01-13 22:16:20 +13:00
Loganbacca
5d0d5d0aba Fixes robot modules not regenerating
- Also added a type check
2015-01-13 16:34:15 +13:00
PsiOmegaDelta
94126b8caa Merge pull request #7795 from mwerezak/fixes
Fixes bad gear datum paths
2015-01-12 11:54:58 +01:00
mwerezak
aeec54aece Fixes bad gear datum paths 2015-01-12 00:19:01 -05:00
mwerezak
b069bfb658 Adjusts infection chances
After some discussion on IRC this seems like a better starting value.
2015-01-12 00:05:47 -05:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
527e83a4e3 Blood/oil stain fixes
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00
PsiOmega
4a68f6097d Fixes #7743.
Makes syndicate and vox shuttle areas radiation safe.
2015-01-11 11:28:24 +01:00
Loganbacca
bc57c8b55d Made thaler bundle merging code more sane
Both bundles are dropped, then the merged one is put in the users hands
2015-01-11 21:44:12 +13:00
Loganbacca
441ee30bfb Fixes multiplying grape soda
Also cleaned up some indenting
2015-01-11 19:14:59 +13:00
Loganbacca
baf763c324 Runtime fix 2015-01-11 19:01:38 +13:00
mwerezak
03e95ecbcf Fixes UI event weighting display 2015-01-10 13:29:19 -05:00
Chinsky
4b3ffa864c Merge pull request #7768 from mwerezak/fixes
Fixes
2015-01-10 21:24:13 +03:00
mwerezak
e49a3a86ae Delays events by 15 minutes on crew autotransfer 2015-01-10 12:48:03 -05:00