GinjaNinja32
c4788ad6f5
Merge remote-tracking branch 'upstream/dev' into viro
...
Conflicts:
code/modules/virus2/disease2.dm
2015-02-03 15:33:37 +00:00
Chinsky
576f9c84a3
Merge pull request #8016 from PsiOmegaDelta/Impersonation
...
Voice changer impersonation now works.
2015-02-03 18:16:23 +03:00
Chinsky
95ff9570ee
Merge pull request #7930 from RKF45/newpaint
...
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
5ed006bcf0
Merge pull request #7902 from Kelenius/ofCratesAndMastermind
...
Changes abandoned crate contencs and replaces minispess with mastermind
2015-02-03 18:15:35 +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
b6ca496a93
Merge pull request #7617 from fira/obscomps
...
Observers Improvements: Ghosts are able to spy on computers, SMES and APCs, with NanoUI and OldUI support
2015-02-03 18:12:16 +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
Chinsky
ac8043d926
Merge pull request #7767 from Amunak/research
...
Allows printing lists of current research levels and technologies
2015-02-03 18:11:06 +03:00
Chinsky
fb929a9688
Merge pull request #7796 from Kelenius/ofVendorsAndSeeds
...
Replaces seed vendors with seed storages
2015-02-03 18:10:57 +03:00
PsiOmegaDelta
70e8efb9fa
Merge pull request #8018 from GinjaNinja32/ai
...
Adds AI latejoin
2015-02-03 16:10:46 +01:00
Chinsky
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
Chinsky
848d1cddd5
Merge pull request #7591 from mwerezak/custom-item
...
Adds blue suit jacket to custom loadout gear
2015-02-03 18:09:44 +03:00
Chinsky
81e40aa542
Merge pull request #7794 from sabiram/dev
...
Adds approved custom item to common loadout pool
2015-02-03 18:09:32 +03: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
SkyMarshal
7c1b70af93
Removes jungle
2015-02-03 04:01:16 -07:00
SkyMarshal
8898689c5d
Cleared out my WIP folder.
2015-02-03 03:20:42 -07:00
SkyMarshal
15bf312f13
Fixes up some helpers.
2015-02-03 03:18:34 -07: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
Chinsky
cbe030b56e
Compile fix
2015-02-03 08:39:39 +03:00
Chinsky
2a1f0849d8
Cleaned out my WIP folder.
2015-02-03 08:27:18 +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
Amunak
9f97269a29
Improves the printed research paper's header.
2015-02-02 17:43:26 +01:00
PsiOmega
8121ef363d
Voice changer impersonation now works.
2015-02-02 13:09:24 +01:00
RKF45
6577cd2a55
Merge remote-tracking branch 'upstream/dev' into newpaint
...
Conflicts:
code/game/objects/items/weapons/paint.dm
2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea
Mixing of paint
...
The generic paint can now be mixed and tranferred.
2015-02-01 22:54:18 +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
PsiOmega
6fabf503e1
Merge remote-tracking branch 'upstream/master' into dev
2015-02-01 17:39:19 +01:00
Zuhayr
20da84646b
Merge pull request #7964 from Baystation12/dev-freeze
...
Dev-Freezer -> Master v0.1.17 Botswan Punchout
2015-02-02 02:14:08 +10:30
Chinsky
19f288e22e
Merge pull request #8005 from Ccomp5950/fixes123
...
Misc Fixes: Removes ahelp categories / robotics maint door.
2015-02-01 18:13:08 +03:00
Zuhayr
d6b03ea768
Merge pull request #7974 from mwerezak/ert
...
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
ccomp5950
b23b5b5d41
Removes categorization of Ahelps.
2015-01-31 21:13:05 -05:00
RKF45
4eb3e16f72
Reviewing paint recipes
...
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
2015-02-01 01:34:39 +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
f8d79ef62a
Gives sec ERT hardsuits mounted eguns
...
Also relocates mounted gun code.
2015-01-31 01:00:36 -05:00
mwerezak
75e0458102
Fixes voidsuit attachment deployment not checking mob_can_equip()
2015-01-30 22:02:07 -05:00
Jamini
683963f1ec
Changed prefix on gloves modified for alien use from "Mangled" to "Modified". Removed stungloves.dm on request of Zuhayr.
...
Signed-off-by: Jamini <mobiousjami@gmail.com >
2015-01-30 18:22:58 -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
21422ab8b5
Merge pull request #7993 from PsiOmegaDelta/PhotoCache
...
Minor photo cache improvement.
2015-01-30 23:46:56 +10:30
Chinsky
e3b02fc62f
Merge pull request #7975 from mwerezak/fixes
...
Fixes #7958
2015-01-30 16:14:16 +03:00
PsiOmega
fa931ae9a9
Photo cache improvements.
...
According to http://www.byond.com/docs/ref/info.html#/proc/browse_rsc browse_rsc() does not resend already cached data, however there is likely also a check to ensure that this data is up to date (using checksums or otherwise) or clients would only ever see the first photo they viewed in a given round.
This small change attempts to ensure that a given photo only has to be downloaded once by appending the photo id to the file name, reducing the risk of #7966 happening.
2015-01-30 10:37:42 +01:00
PsiOmegaDelta
80132bdd23
Merge pull request #7978 from Zuhayr/dev-freeze
...
Fixes
2015-01-30 09:25:23 +01:00
SkyMarshal
812f7553f1
Fixes a runtime in the artifact harvester.
2015-01-29 21:52:52 -07:00
