Fox-McCloud
4d2a77dbf7
Merge pull request #653 from ZomgPonies/headspear
...
Sticking heads on spears
2015-03-25 09:37:36 -04:00
Fox-McCloud
b3270fe360
Merge pull request #650 from ZomgPonies/beartraps
...
IED fix and trap
2015-03-25 09:37:08 -04:00
ZomgPonies
de86bc0843
Merge pull request #664 from Fox-McCloud/Prox-Mine
...
Prox Mine Fix
2015-03-25 09:35:05 -04:00
ZomgPonies
17dfe4e481
Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs
...
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
2015-03-25 09:33:21 -04:00
ZomgPonies
0b92c311df
Merge pull request #666 from Fox-McCloud/Goonchem-Additions
...
[Goonchem] Few Additional Chemicals
2015-03-25 09:33:11 -04:00
Fox-McCloud
279ea75e62
Touch Ups
2015-03-25 09:12:10 -04:00
Fox-McCloud
33293763f4
gauze is gauze. Shocker
2015-03-25 09:03:20 -04:00
Fox-McCloud
3e1fac8c94
[Goonchem] FirstAid Transitions
2015-03-25 08:45:36 -04:00
Fox-McCloud
dbb04f4dbb
[Goonchem] Few Additional Chemicals
2015-03-25 03:50:54 -04:00
Fox-McCloud
e45a5ac46a
Prox Mine Fix
2015-03-25 00:27:11 -04:00
Fox-McCloud
84a659605d
Merge pull request #663 from Iamgoofball/muh_doctors_delight
...
MUH FIXES
2015-03-25 00:18:05 -04:00
Iamgoofball
4f3cc168a4
fixes facid and makes it work, renames bad food
2015-03-24 21:11:18 -07:00
Iamgoofball
f165cb7079
muh fixes 2.0
2015-03-24 21:01:02 -07:00
Iamgoofball
cea9957062
MUH FIXES
2015-03-24 20:54:59 -07:00
Fox-McCloud
d005152fe6
Merge pull request #652 from ZomgPonies/prisonbreak
...
Fixed prison break event
2015-03-24 23:18:30 -04:00
ZomgPonies
184b9bdd66
Merge pull request #661 from Fox-McCloud/Goonchem-Map
...
Goonchem Map Changes
2015-03-24 23:08:18 -04:00
Fox-McCloud
b30d3f795f
Goonchem Map Changes
2015-03-24 22:48:25 -04:00
ZomgPonies
98959cec1a
Merge pull request #660 from Iamgoofball/muh_doctors_delight
...
i forgot to remove old cyanide in favor of new cyanide, rippers
2015-03-24 22:25:06 -04:00
Iamgoofball
19fa3848fb
i forgot to remove old cyanide in favor of new cyanide, rippers
2015-03-24 19:19:03 -07:00
ZomgPonies
273631773c
Merge pull request #659 from Iamgoofball/muh_doctors_delight
...
adds chem heaters to map
2015-03-24 22:13:53 -04:00
Iamgoofball
f0fb50a1be
adds chem heaters to map
2015-03-24 19:07:43 -07:00
ZomgPonies
f9b3f2b587
Merge pull request #648 from Iamgoofball/muh_doctors_delight
...
GOONCHEM
2015-03-24 21:51:58 -04:00
ZomgPonies
ee973c5f1a
Merge pull request #646 from Fox-McCloud/Object-Spinning
...
Thrown Object Spinning
2015-03-24 21:49:57 -04:00
Iamgoofball
617f2b8aec
guys, the medical analyzer upgrade, go get it
2015-03-24 18:44:39 -07:00
Fox-McCloud
40b04de8c9
no spinning
2015-03-24 21:42:04 -04:00
Iamgoofball
015c9d4a11
muh spans
2015-03-24 18:20:50 -07:00
Iamgoofball
d091031ca6
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight
...
Conflicts:
code/modules/reagents/Chemistry-Machinery.dm
2015-03-24 18:03:11 -07:00
Iamgoofball
44d9ef204e
snowflake code makes me *scream V2
2015-03-24 17:59:07 -07:00
Iamgoofball
f5f172652e
snowflake code makes me *scream
2015-03-24 17:58:10 -07:00
ZomgPonies
522401f682
Merge pull request #658 from Artorp/mapfix
...
Mechanic Workshop map additions
2015-03-24 20:51:04 -04:00
ZomgPonies
1a09f728ed
Merge pull request #644 from Fox-McCloud/Chemistry-Tweaks
...
Chemistry Balance: Plasma
2015-03-24 20:50:33 -04:00
ZomgPonies
8012022f5d
Merge pull request #642 from SamCroswell/HolyWaterBalance
...
Vampire Holy Water Balancing
2015-03-24 20:50:23 -04:00
Artorp
8fcda52164
Whoops, misclick
2015-03-25 01:37:52 +01:00
Artorp
9eec648c61
Mechanic Workshop fire ext
...
Added fire extinguisher
2015-03-25 01:35:48 +01:00
Artorp
5cb3f1bf29
Mechanic Workshop map additions
...
- Adds welder goggles to Mechanic Workshop
- Changes stack of plasteel into stack of plasma
- Minor area fix in maintenence
2015-03-25 00:43:48 +01:00
Iamgoofball
1278f31661
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2015-03-24 16:35:06 -07:00
ZomgPonies
8dfaa39ecb
Updates PR with Fox's suggestions
2015-03-24 19:27:05 -04:00
ZomgPonies
8c265bf6aa
Merge pull request #640 from Fox-McCloud/Health-Analyzer
...
Health Analyzer Upgrading
2015-03-24 17:56:02 -04:00
ZomgPonies
58e732b56b
Merge pull request #657 from SamCroswell/MapFixes
...
Minor Map Fixes
2015-03-24 17:55:50 -04:00
Iamgoofball
ae2240f513
fuck shit goddamn salglu
2015-03-24 14:03:40 -07:00
SamCroswell
65394ea5b4
Minor Map Fixes
...
Moves the Syndie Elite Shuttle back to the area above arrivals. Not sure
what moved it since my last map PR.
Adds two missing windows in the admin room.
2015-03-24 16:05:35 -04:00
Iamgoofball
20afecd650
help this guy died of styptic pills worst coder 2015
2015-03-24 13:02:09 -07:00
Fox-McCloud
6b543f37ff
Merge remote-tracking branch 'upstream/master' into Health-Analyzer
2015-03-24 15:53:37 -04:00
ZomgPonies
833ead52ef
Merge pull request #618 from TheDZD/changeling
...
Combat Changeling Nerfs
2015-03-24 14:03:04 -04:00
ZomgPonies
225a448ea7
Sticking heads on spears
2015-03-24 13:42:33 -04:00
ZomgPonies
928a9a7c88
Fixed prison break event
2015-03-24 11:54:55 -04:00
ZomgPonies
3f51d1135a
Re-adds old IED recipe, allows IED -> Beartraps
2015-03-24 09:10:10 -04:00
ZomgPonies
30d5ce38f2
Merge pull request #649 from tigercat2000/SPFConstruct
...
Whoops, left in an old reference, didn't update parts, fixes #643
2015-03-24 08:08:20 -04:00
ZomgPonies
46d39ffb8f
Merge pull request #647 from Artorp/podfab
...
Spacepod fabricator output turf check
2015-03-24 08:03:36 -04:00
ZomgPonies
60525012c8
Merge pull request #641 from fj45/master
...
Mechanics workshop, take two!
2015-03-24 08:03:28 -04:00
Fox-McCloud