Commit Graph
4811 Commits
Author SHA1 Message Date
PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky 649473e0ec Restred medical side effects file since turns out it's used (need to look into why it doesn't appear to be later) 2015-02-03 12:19:09 +03:00
Chinsky 72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
volas ea8e848463 copytext() check for some input 2015-02-01 23:16:04 +03:00
volas 8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
Chinsky a5219535f6 Merge pull request #7997 from mwerezak/fixes
Fixes voidsuit attachment deployment not checking mob_can_equip()
2015-01-31 09:25:16 +03:00
mwerezak 75e0458102 Fixes voidsuit attachment deployment not checking mob_can_equip() 2015-01-30 22:02:07 -05:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Zuhayr b280cb6d42 Fixes #7919 2015-01-29 11:27:56 +10:30
Zuhayr d0f76833d9 Fixes #7976 2015-01-29 11:15:18 +10:30
GinjaNinja32 bc0f5762be Camera sorting improvements 2015-01-28 04:33:31 +00:00
Chinsky c7aff28ffe Merge pull request #7962 from Baystation12/master
master->freeze
2015-01-27 21:55:46 +03:00
Loganbacca 8c53e30cfa Fixes telekinetic cat stealing 2015-01-26 19:53:42 +13:00
Loganbacca 37ceccf5a4 Fixed removed items being put inside borgs 2015-01-26 18:24:12 +13:00
PsiOmega d70a3dcdc0 Downgrades AIs sight to that of borgs. 2015-01-24 17:59:19 +01:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
PsiOmegaDelta c780437354 Merge pull request #7911 from mwerezak/virus
Virus Protection Fix
2015-01-22 18:40:19 +01:00
unknownandmwerezak 7590bbac99 Infection chance proc improvements
Instead of magic type bits, the infection protection value of clothing is mostly based on it's bio armor value, which is much more flexible. Also gloves and shoes to contribute to protection values, and adjusts surgical mask bio protection.
Hardsuits gain voidsuit level bio protection, when sealed.
Wearing a face mask helps prevent others from catching airborne diseases.
Also fixes #7909
2015-01-22 11:10:57 -05:00
Zuhayr d1a4c54975 Merge pull request #7904 from GinjaNinja32/runtime2
Fixes a warning and some runtimes
2015-01-22 10:46:20 +10:30
GinjaNinja32 166e7528fb Fixes monkeyize runtime due to ghostize trying to remove verbs from a non-existent client 2015-01-21 21:07:41 +00:00
PsiOmega 9452c11b56 Reduces the risk of unnecessary borg designation announcements. 2015-01-20 20:40:35 +01:00
Zuhayr aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
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
Chinsky 6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03: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 c2b5c53092 Merge pull request #7845 from Ravensdale/runtimeFixes
Fixes Cannot execute null.on removed()
2015-01-16 11:22:47 +03:00
Ravensdale fdf9886053 Fixes Cannot execute null.on removed() 2015-01-15 14:48:04 -08:00
Chinsky 1c772e9914 Fixes #7821 2015-01-15 16:45:45 +03:00
PsiOmega 5c6c65e728 Can no longer see the AI eye by right or alt-clicking turfs. 2015-01-15 10:25:49 +01: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
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
Loganbacca baf763c324 Runtime fix 2015-01-11 19:01:38 +13:00
mwerezak 0c9107afff Fixes hostile simple mobs targeting distant mechs 2015-01-09 21:36:44 -05:00
Zuhayr 6a6332437a Merge pull request #7750 from Amunak/patch-1
Reverted "say error helper" before there is a better implementation or option to toggle it
2015-01-09 14:11:05 +10:30
Amunak 8fa2fdb51b Reverted "say" error helper
Commented out the "say error helper" before we have a better implementation or before it can at least be toggleable. Current state doesn't fit way too many edge casess.
2015-01-09 03:56:58 +01:00
Zuhayr 5bbe1ecaa8 Amends nymph pulling fix to add higher w_class. Adds fail messages to pAI and nymphs trying to drag non-items. 2015-01-09 08:59:38 +10:30
Zuhayr 683c8b50a8 Fixes #7702 2015-01-09 08:09:46 +10:30
Zuhayr 7c88b54404 Fixes #7722 2015-01-09 07:30:48 +10:30
Zuhayr a4fca84e3e Fixes #7726 2015-01-09 06:44:09 +10:30
Zuhayr 7e0610e31c Fixes #7684 2015-01-09 04:18:42 +10:30
Zuhayr 8d2d3302bd Fixes #7720 2015-01-09 04:07:08 +10:30
Zuhayr c3756e3a03 Fixes #7701 2015-01-09 04:05:11 +10:30
Zuhayr 29435d8750 Fixes #7700 2015-01-09 03:56:12 +10:30
Zuhayr cd53ed613c Fixes #7691 2015-01-09 03:51:47 +10:30
Zuhayr 66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Kelenius 4c63e6a3ea Restores monkey's ability to ventcrawl
Fixes #7474.
2015-01-03 22:41:57 +03:00