Commit Graph

17074 Commits

Author SHA1 Message Date
Fox-McCloud
5de7506e84 pre-emptive fix 2015-03-22 21:06:50 -04:00
Fox-McCloud
cedb71e8af Clarity 2015-03-22 20:18:01 -04: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
9f59b20303 Merge pull request #624 from Artorp/meat
Fixes meat harvesting of some simple_animals
2015-03-22 17:59:48 -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
7b84658a33 Fix giving things to non-carbons 2015-03-22 19:50:55 +01:00
Tigercat2000
6f067db90c whoops left a conflict in 2015-03-22 18:53:25 +01:00
Remie Richards
0d2d2ddb71 Adds getPixelDistance()
Adds a proc for finding the distance between two atoms, in pixels
Conflicts:
	code/__HELPERS/unsorted.dm
2015-03-22 18:50:09 +01:00
Tigercat2000
86f8ed5111 Fixes related issue with spamclicking lights 2015-03-22 18:36:54 +01: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
Fox-McCloud
d9a257c890 Teleporter Gun, Fixes, and Tweaks 2015-03-22 02:45:02 -04:00
Artorp
e7434672bc Fixes meat harvesting of some simple_animals 2015-03-22 05:08:32 +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
fff1e913f4 typo-fix 2015-03-21 01:52:21 -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
Mark van Alphen
a50db87e12 Merge pull request #609 from Fox-McCloud/Xeno-Temp
Xeno Space Fix
2015-03-20 21:30:30 +01:00
Fox-McCloud
3d89f8707c Xeno Space Fix 2015-03-20 16:10:11 -04:00
Fox-McCloud
094b6e506e Dragon's Breath Fix 2015-03-20 15:33:27 -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
ab619f66ee Merge pull request #590 from tigercat2000/HeartBeatPort
Heartbeat sound port from Baystation12/Baystation12#8386
2015-03-19 01:41:33 -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
Mark van Alphen
9c97c44091 Merge pull request #598 from SamCroswell/NinjaDev
Pathing Fixes
2015-03-18 22:45:59 +01:00
SamCroswell
c71b4c4f26 Pathing Fixes
Fixes a pathing issue with katans and hyposprays.
2015-03-18 17:22:15 -04:00
Fox-McCloud
ba98e33b66 Proper Bible Farting 2015-03-17 19:40:46 -04:00
Markolie
74724e6936 Radio uplink refund fix 2015-03-17 22:54:21 +01:00
Fox-McCloud
2b33c18bfe Overcharged Flash 2015-03-17 17:10:24 -04:00
Fox-McCloud
d0a09c8126 Mindslave, Loyalty, and Knockdown fixes. 2015-03-17 14:01:36 -04:00
Tigercat2000
000ec34d97 New sounds for Machine People/Robotic Hearts/Assissted Hearts 2015-03-17 18:39:42 +01:00