Commit Graph

4849 Commits

Author SHA1 Message Date
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
PsiOmegaDelta
dd52f970e2 Merge pull request #7856 from mwerezak/emote
Adds ^ say shortcut for visible emotes
2015-02-03 16:11:36 +01:00
Chinsky
74df9669a0 Merge pull request #7719 from Zuhayr/species_tweaks
Species tweaks.
2015-02-03 18:11:18 +03:00
PsiOmegaDelta
70e8efb9fa Merge pull request #8018 from GinjaNinja32/ai
Adds AI latejoin
2015-02-03 16:10:46 +01:00
Chinsky
a5ad6daba5 Merge pull request #7739 from Zuhayr/dev
Readds moonwalking.
2015-02-03 18:09:25 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
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
GinjaNinja32
271fe31e64 Admin verb to toggle latejoin-ability. Wipe Core disallowed in malfunction. 2015-02-02 18:34:26 +00:00
GinjaNinja32
6ea6c82897 AI latejoin 2015-02-02 17:59:57 +00: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
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01: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
34a7549460 Merge pull request #7963 from Baystation12/dev-freeze
freeze->warlock
2015-01-27 21:56:07 +03: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
Ravensdale
5878d415ad Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mappin 2015-01-25 20:36:19 -08: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
Zuhayr
22edc4bc90 Merge pull request #7920 from Baystation12/dev-freeze
Dev freeze into dev
2015-01-23 13:01:23 +10:30
PsiOmegaDelta
c780437354 Merge pull request #7911 from mwerezak/virus
Virus Protection Fix
2015-01-22 18:40:19 +01:00
unknown
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
9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-01-21 08:53:27 +01:00
PsiOmega
9452c11b56 Reduces the risk of unnecessary borg designation announcements. 2015-01-20 20:40:35 +01:00
Zuhayr
3986961226 Readds moonwalking. 2015-01-20 19:16:36 +10:30
Zuhayr
8756bb99bd Adds species-specific comfort tweaks, skrell nutrition changes. 2015-01-20 19:12:35 +10:30
Zuhayr
d466d740e4 Merge pull request #7886 from Baystation12/dev-freeze
Updating from dev freeze
2015-01-20 18:49:36 +10:30
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
9890bdc86d Merge pull request #7851 from Baystation12/dev-freeze
Dev freeze -> dev
2015-01-16 14:24:06 +03: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
mwerezak
dc23588a81 Less calls to copytext() 2015-01-14 23:03:21 -05:00
mwerezak
c0a896282c Adds visible emote shortcut to complement the audible emote shortcut. 2015-01-14 21:25:28 -05:00