Kelenius
|
9edb5751fb
|
Adds tobacco and maps in drying racks
|
2015-02-03 22:24:49 +03:00 |
|
PsiOmega
|
21a0aa05e5
|
Topic now uses the NanoUI can_interact_with_interface() proc to determine functionality.
can_interact_with_interface() has been updated with the old canUseTopic() checks.
|
2015-02-03 20:24:11 +01:00 |
|
Kelenius
|
536388978f
|
Conflict fix
|
2015-02-03 20:57:16 +03:00 |
|
PsiOmega
|
9da907cef4
|
Breaks out NanoUI interaction checks into proper procs instead of type checks.
|
2015-02-03 18:56:35 +01:00 |
|
Kelenius
|
0e7ed6aef4
|
Merge branch 'dev' into ofDryingAndRacks
|
2015-02-03 20:51:27 +03:00 |
|
GinjaNinja32
|
05532fd330
|
Merge remote-tracking branch 'upstream/dev' into supply
|
2015-02-03 17:22:10 +00:00 |
|
GinjaNinja32
|
444c7c71f3
|
Maps in floor painter in engineering workshop, makes it and pipe painters orderable from Cargo
|
2015-02-03 17:19:45 +00:00 |
|
GinjaNinja32
|
95ec6a4dfe
|
Changes cure mechanism
|
2015-02-03 16:41:08 +00:00 |
|
GinjaNinja32
|
37f47fd3fa
|
Merge remote-tracking branch 'upstream/dev' into viro
|
2015-02-03 16:28:10 +00:00 |
|
PsiOmega
|
49eac0d9ca
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-02-03 17:23:04 +01:00 |
|
PsiOmega
|
0d84f836a4
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-02-03 17:15:02 +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 |
|
GinjaNinja32
|
c4788ad6f5
|
Merge remote-tracking branch 'upstream/dev' into viro
Conflicts:
code/modules/virus2/disease2.dm
|
2015-02-03 15:33:37 +00: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 |
|
GinjaNinja32
|
fa75cb9fab
|
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
|
2015-02-03 15:23:48 +00:00 |
|
Chinsky
|
c3559556a0
|
Merge pull request #8027 from Baystation12/dev-freeze
Wiz freeze
|
2015-02-03 18:23: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
|
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
|
7ef4192950
|
Merge pull request #7941 from mwerezak/radiator
Expands on SkyMarshal's radiation changes
|
2015-02-03 18:14:56 +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
|
6c4f0a1541
|
Merge pull request #7949 from Loganbacca/pipemaker
Mirrored manual T-valves
|
2015-02-03 18:14:00 +03:00 |
|
PsiOmegaDelta
|
ba72db2275
|
Merge pull request #7866 from SparklySheep/patch-12
Adds medical belts to sterile equipment crate.
|
2015-02-03 16:12:40 +01: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
|
cda262bbe4
|
Merge pull request #7863 from Kelenius/ofAlarmsAndScrubbers
Adds oxygen and nitrogen to air alarm scrubber list
|
2015-02-03 16:11:49 +01: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
|
6546dc6a77
|
Merge pull request #7682 from SparklySheep/patch-11
Adds the visitor alt-title.
|
2015-02-03 18:09:50 +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 |
|
Chinsky
|
b70db8d8d7
|
RIP in history, dead code
|
2015-02-03 17:19:56 +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
|
95eacd2185
|
Merge pull request #8008 from volas/sanitize_procs
Fixes for some sanitize moments
|
2015-02-03 15:08:47 +03: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 |
|