Techhead0
aa22f7307a
Replaces gaseous reagents with organic chemistry ones.
...
Hydrogen, Oxygen, Nitrogen, Chlorine, and Fluorine have been replaced with Hydrazine, Acetone, Ammonia, and Hydrochloric Acid.
The new chemicals have been given appropriate effects and integrated into hydroponics.
Flammable liquids have higher touch_met so they don't take forever to build fire stacks.
Liquid phoron now contaminates clothing and burns eyes when splashed on mobs.
2015-05-19 09:32:24 -04:00
Zuhayr
4ea779ae6c
Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
...
Cleans up welder code.
2015-05-17 20:21:31 +09:30
PsiOmega
c16d033b18
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-17 11:30:04 +02:00
PsiOmegaDelta
b423ba7bc4
Merge pull request #9319 from Baystation12/master
...
Dev-freeze
2015-05-17 11:29:39 +02:00
PsiOmega
2c60619273
Restores the original messages.
2015-05-17 10:25:37 +02:00
Chinsky
1f76ae4250
Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516
...
Teleport anomaly fix.
2015-05-17 09:07:53 +03:00
PsiOmega
8b39f9201a
Compilation fixes.
2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/projectiles/guns/launcher/crossbow.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
PsiOmegaDelta
4db25c61d2
Merge pull request #9313 from Baystation12/master
...
Dev-freeze
2015-05-16 22:36:03 +02:00
Zuhayr
dbe8221c60
Merge pull request #9308 from Karolis2011/dev
...
Made sorting and tagger pipes dispensible
2015-05-17 03:23:10 +09:30
PsiOmegaDelta
d4c205e12a
Merge pull request #9200 from mwerezak/tail-swish
...
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
Karolis2011
645ad1a177
Made tagger pipe dispensible.
2015-05-16 18:05:47 +03:00
Karolis2011
0999f1ab78
Made sorting pipes dispesible
...
also fixes #9305
2015-05-16 17:27:39 +03:00
PsiOmega
21dad8bdc0
Teleport anomaly fix.
...
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
2015-05-16 14:46:57 +02:00
PsiOmega
aad28d63ce
Cleans up welder code.
...
Icon and inhand states should now update properly.
2015-05-16 14:13:24 +02:00
PsiOmegaDelta
65151ade35
Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate
...
Inflatables now lose deflate verb when it's used
2015-05-16 13:51:16 +02:00
PsiOmegaDelta
98fce1fa1e
Merge pull request #9301 from Kelenius/ofChemAndRuntime
...
Fixes #9294
2015-05-16 13:47:05 +02:00
Chinsky
2359245f06
Merge pull request #9285 from mwerezak/master-fixes
...
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00
GinjaNinja32
137c77c19d
Typo fix
2015-05-16 10:48:59 +01:00
Zuhayr
1de493c272
Fixes #9021
2015-05-16 18:45:31 +09:30
Kelenius
b4bfe917eb
Fixes #9294
2015-05-16 12:05:14 +03:00
Zuhayr
36acf64f18
Partial fix for #8825
2015-05-16 18:33:03 +09:30
Kelenius
af14ec1855
Inflatables now lose deflate verb when it's used
2015-05-16 11:43:30 +03:00
Zuhayr
edb1d501d6
Fixes #9217
2015-05-16 17:56:28 +09:30
Zuhayr
00855d636f
Fixes #8389
2015-05-16 17:54:21 +09:30
Zuhayr
e1a14e3c41
Removes xenoarch reconstitutors entirely. "Fixes" #5413
2015-05-16 17:40:49 +09:30
Zuhayr
7e14930209
Merge pull request #9249 from GinjaNinja32/new_tables
...
Table rewrite
2015-05-16 17:32:47 +09:30
Zuhayr
5d51d0e423
Merge pull request #9267 from Hubblenaut/cameras
...
Camera Rebalance
2015-05-16 17:28:29 +09:30
GinjaNinja32
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
PsiOmegaDelta
38eb1ad7b9
Merge pull request #9263 from Hubblenaut/dev
...
Cleans up access and map artifacts
2015-05-16 09:33:11 +02:00
PsiOmegaDelta
05033b5762
Merge pull request #9278 from Ccomp5950/ravensrequest
...
Admin log fix: Something that really annoys ravensdale.
2015-05-16 09:29:15 +02:00
PsiOmegaDelta
07cb2aa1ad
Merge pull request #9291 from Techhead0/seeTheInvisible
...
Invisible people can now be heard by visible_message
2015-05-16 08:57:21 +02:00
Ccomp5950
10a8c56c5d
Merge pull request #9286 from Zuhayr/dev
...
Fixes, clothes stripping refactor.
2015-05-16 00:53:14 -04:00
mwerezak
d71a727131
remove_from_mob() considered harmful
2015-05-16 00:32:44 -04:00
mwerezak
5d620ff05b
Span classes
2015-05-16 00:21:40 -04:00
mwerezak
3e41d6ff6e
Fixes crossbow icon issue
...
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
2015-05-15 23:06:29 -04:00
mwerezak
65819302f3
Fixes #8986 , one less object verb
2015-05-15 23:06:02 -04:00
mwerezak
29609f7ec6
Fixes #8985 , ammo magazine examine grammar.
2015-05-15 23:04:50 -04:00
Techhead0
35e44ab8d9
Invisible people can now be heard by visible_message
...
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
2015-05-15 21:06:16 -04:00
ccomp5950
19cc6df391
Conversion to admin_attack_log()
2015-05-15 17:07:07 -04:00
Techhead0
ec37652997
Fixes #7999
2015-05-15 13:34:46 -04:00
Zuhayr
f021467f8b
Merges two redundant procs.
2015-05-16 01:55:19 +09:30
Zuhayr
890693b839
Allowed accessories to function as custom items using icon_override
2015-05-16 01:37:04 +09:30
Zuhayr
8611499e87
Fixes #8842
2015-05-15 23:53:59 +09:30
Zuhayr
7535e027b9
Fixes #9192
2015-05-15 23:53:38 +09:30
Zuhayr
f65c4e95f6
Fixes #9060
2015-05-15 23:38:01 +09:30
Zuhayr
325bd42c66
Fixes #9233
2015-05-15 23:37:52 +09:30
Zuhayr
256c057608
Fixes #8376
2015-05-15 23:27:33 +09:30
Zuhayr
5b9eefdebf
Merge with dev.
2015-05-15 23:22:48 +09:30
Zuhayr
1e1471a601
Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173 .
2015-05-15 23:19:57 +09:30
