Commit Graph

8544 Commits

Author SHA1 Message Date
Iamgoofball
617f2b8aec guys, the medical analyzer upgrade, go get it 2015-03-24 18:44:39 -07:00
Iamgoofball
015c9d4a11 muh spans 2015-03-24 18:20:50 -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
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
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
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
3db10c7c37 Merge pull request #635 from Fox-McCloud/Taperecorder
Taperecorder Rework
2015-03-24 08:01:16 -04:00
Tigercat2000
ca4b092445 Whoops, left in an old reference, didn't update parts, fixes #463 2015-03-24 12:56:59 +01:00
Iamgoofball
e5264815ee GOONCHEM 2015-03-24 02:04:47 -07:00
Artorp
2c105174f4 Spacepod fabricator output turf check
Makes the spacepod fabricator check all cardinal directions and
dynamically find an output turf
2015-03-24 07:53:27 +01:00
Fox-McCloud
69bc15604d Health Analyzer Upgrading 2015-03-23 19:44:06 -04:00
ZomgPonies
56de2ab011 Merge pull request #631 from tigercat2000/SpessPodUpdates
Massive spacepod construction overhaul by /VG/
2015-03-23 16:53:13 -04:00
Mark van Alphen
b7831c543b Merge pull request #611 from Fox-McCloud/ZAS-Tweaks
ZAS Tweaks
2015-03-23 15:38:48 +01:00
Mark van Alphen
98f06c5d4d Merge pull request #627 from tigercat2000/ChaplainNERRFSS
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-23 15:38:40 +01:00
Mark van Alphen
f8605bd406 Merge pull request #608 from Fox-McCloud/Temporary-Fires
New Feature: Temporary Fires, Napalm Rework, and Dragon's Breath Round Fix
2015-03-23 15:38:28 +01:00
Tigercat2000
8519d592b4 Update to Fox's specifications 2015-03-23 11:39:39 +01:00
Fox-McCloud
aa5cdae070 Taperecorder Rework 2015-03-23 05:45:15 -04:00
Tigercat2000
76ffbbfd59 Massive spacepod construction overhaul by /VG/ 2015-03-23 02:36:49 +01:00
Fox-McCloud
8da3cb1de5 Merge pull request #616 from tigercat2000/BorgIlocker
Allow borgs to open-close lockers properly
2015-03-22 18:00:35 -04:00
Fox-McCloud
2d4f754edb Merge pull request #628 from tigercat2000/FixStatueClick
Add clickdelay to attacking statues & lights
2015-03-22 17:59:00 -04:00
Fox-McCloud
b444ec3f09 Merge pull request #619 from TheDZD/applepocalypse-prevention
Applepocalypse Prevention
2015-03-22 17:58:19 -04:00
Tigercat2000
689713ddbd Add clickdelay to attacking statues 2015-03-22 18:24:20 +01:00
Tigercat2000
9a19420ac3 Fix spelling error 2015-03-22 15:39:25 +01:00
Tigercat2000
c40c37390f Allow Chaplain to bless beakers by inserting them into his bible 2015-03-22 15:29:37 +01:00
DZD
bd863d0d89 Applepocalypse Prevention
- Nutriment is no longer insanely good for increasing a hydroponics
tray's yield_mod, it's now marginally worse than robust harvest, which
is marginally more difficult to make.
- yield_mod is now capped at 100, no more getting 2000+ items out of one
harvest.
2015-03-21 15:23:28 -04:00
DZD
2df1e5e8ed Combat Changeling Nerfs
- Armblade and Chitinous Armor cost from 20 to 25.
- Made armor values for chitinous helmet consistent with chitinous
armor, minor increase to the energy resistance of the armor.
- Resonant and Dissonant Shriek costs from 20 to 30.
- Dissonant Shriek light EMP range from 5 to 4, heavy EMP range is
unchanged and remains 2.
2015-03-21 14:56:54 -04:00
Markolie
24626bc081 Testing lab changes 2015-03-21 16:18:42 +01:00
Markolie
3c8ca1fafd Fix admin radio chat preference applying to non-admins 2015-03-21 15:38:20 +01:00
Tigercat2000
b9adc59d26 Allow borgs to open-close lockers properly 2015-03-21 14:28:29 +01:00
Mark van Alphen
b5b4d6f178 Merge pull request #604 from Fox-McCloud/Science-Job
Science Job Homogenization and Test Lab
2015-03-21 14:06:03 +01:00
Artorp
fc45243f8a Bugfixes
- Disables random events by default, requires config.txt to enable
random events
- Makes portable turrets respect its preset anchored value
- Gives flamethrower a real category
2015-03-21 13:39:00 +01:00
Fox-McCloud
9749c04d15 Merge pull request #605 from FalseIncarnate/master
Grape Juice
2015-03-21 01:58:02 -04:00
Fox-McCloud
f969f51379 ZAS Tweaks 2015-03-20 23:21:51 -04:00
Fox-McCloud
ba28d8e5b3 Incendiary Grenade 2015-03-20 17:02:22 -04:00
Fox-McCloud
01fa55adda Test Lab 2015-03-20 07:11:30 -04:00
ZomgPonies
0ee915abeb Merge pull request #602 from Fox-McCloud/Recursive-Explosions
Removes Recursive Explosions
2015-03-20 02:58:54 -04:00
FalseIncarnate
0541f7c3c8 Grape Juice
Re-adds grape juice to the game.
- Adds Grapel Juice to the vending machine.
- Get your purple cans for 20 credits.
- Adds Grape Juice to the bar's soda fountain.
- Adds the ability to juice grapes into Grape Juice.

This makes purple candies possible, and who doesn't want to fill their
cup with PURPLE DRANK.
2015-03-20 00:24:23 -04:00
Fox-McCloud
43456a5934 Merge pull request #600 from tigercat2000/GibberRefactor
Gibber Refactor as (kindof) per Baystation12/Baystation12#7510
2015-03-19 23:37:32 -04:00
Fox-McCloud
b97d79fa02 Merge pull request #599 from TheDZD/plasma-structures
Removes plasma mineral doors burning
2015-03-19 23:36:46 -04:00
Fox-McCloud
ff2ef502d4 Science Job Homogenization 2015-03-19 20:01:02 -04:00
Fox-McCloud
38adfe06a0 Removes Recursive Explosions 2015-03-19 03:23:14 -04:00
ZomgPonies
8baa1e4ba9 Merge pull request #595 from Fox-McCloud/Bible-Farting
Proper Bible Farting
2015-03-19 01:42:19 -04:00
ZomgPonies
ab963bdb10 Merge pull request #594 from Fox-McCloud/Overcharged-Flash
Overcharged Flash
2015-03-19 01:42:03 -04:00
ZomgPonies
bfb1969279 Merge pull request #592 from Fox-McCloud/mindslave-loyalties
Mindslave, Loyalty, and Knockdown fixes.
2015-03-19 01:41:51 -04:00
ZomgPonies
3fc1941a14 Merge pull request #588 from Fox-McCloud/Implants
Implant Cleanup
2015-03-19 01:41:18 -04:00
Tigercat2000
1191fb912e Gibber Refactor/Mousedrop/LayerHandling/AutogibberFix 2015-03-19 03:17:38 +01:00
DZD
f81848033f Comments out plasma mineral doors burning 2015-03-18 22:15:41 -04:00