PsiOmega
0ec47b225f
Merge remote-tracking branch 'upstream/dev' into GhostSight
...
Conflicts:
code/setup.dm
2015-02-04 00:00:17 +01:00
Zulker Nayeen Nahiyan
0a3f523066
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
...
Conflicts:
code/__HELPERS/maths.dm
code/__HELPERS/type2type.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/rig/rig_pieces.dm
code/modules/clothing/spacesuits/rig/suits/light.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/utility.dm
code/modules/events/event_manager.dm
code/modules/mob/living/living.dm
code/setup.dm
2015-02-04 04:44:09 +06:00
PsiOmega
a7a33e0a35
Merge remote-tracking branch 'upstream/dev' into GhostSight
...
Conflicts:
code/modules/mob/dead/observer/observer.dm
2015-02-03 22:28:53 +01:00
PsiOmegaDelta
021096d924
Merge pull request #7841 from comma/firefirEFIREBURNAHAHAHA
...
Ported TG's code for burny mobs, by ergovisavi.
2015-02-03 17:02:09 +01:00
Chinsky
71b19d5d8f
Stupid typo & missing constants
2015-02-03 18:44:26 +03:00
PsiOmegaDelta
24a7f5b5f0
Merge pull request #7938 from LethalGhost/dev
...
More convenient give verb.
2015-02-03 16:32:20 +01:00
Chinsky
84472462ab
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA
...
Conflicts:
code/modules/mob/living/living_defines.dm
2015-02-03 18:30:18 +03:00
Chinsky
576f9c84a3
Merge pull request #8016 from PsiOmegaDelta/Impersonation
...
Voice changer impersonation now works.
2015-02-03 18:16:23 +03:00
Chinsky
889fee1b82
Merge pull request #7983 from PsiOmegaDelta/SynthStamp
...
Timestamped AI radio messages.
2015-02-03 18:14:44 +03:00
Chinsky
28ee1be312
Merge pull request #7952 from PsiOmegaDelta/AIEye
...
Observers can now see the AI eye
2015-02-03 18:14:08 +03:00
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
PsiOmega
8121ef363d
Voice changer impersonation now works.
2015-02-02 13:09:24 +01: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
mwerezak
1f869ebe1a
Mob fire adjustments
...
Temperature increase caused by being on fire is now affected by
get_heat_protection().
If a mob is on fire but it's fire_stack <= 0 then it gets extinguished,
just in case.
2015-02-01 12:11:43 -05: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
PsiOmega
151b8ddd52
Timestamped AI radio messages.
...
Radio messages received by the AI are now timestamped.
2015-01-29 10:21:17 +01:00
PsiOmega
fb84e5f50a
Ghosts now have more sight options.
...
Can now toggle between the following modes:
* See other observers + AI eye + darkness
* See only darkness
* No darkness
2015-01-29 09:11:39 +01: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
Lethal Ghost
f8ad509eb7
Update give verb (text lines).
...
Replace the outdated macros with span classes.
2015-01-27 19:51:24 +05:00
PsiOmega
f6b3bfce1c
The AI eye now has a sprite.
...
Also defines new (see_)invisibility levels for the AI eye, to ensure that cultists visiting the other side cannot suddenly see it while still allowing observers to.
Uses a black and white version of the face hologram as placeholder.
2015-01-26 22:28:13 +01: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
Lethal Ghost
f4471e4fdb
More convenient give verb.
...
You can give item by one click.
And you are not able try to give items to yourself.
2015-01-25 20:33:18 +05: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
