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
f5f172652e
snowflake code makes me *scream
2015-03-24 17:58:10 -07: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
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
Iamgoofball
ae2240f513
fuck shit goddamn salglu
2015-03-24 14:03:40 -07: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
3db10c7c37
Merge pull request #635 from Fox-McCloud/Taperecorder
...
Taperecorder Rework
2015-03-24 08:01:16 -04:00
Iamgoofball
e5264815ee
GOONCHEM
2015-03-24 02:04:47 -07:00
Fox-McCloud
b095f866df
Chemistry Balance
2015-03-24 00:33:24 -04:00
SamCroswell
a6f251574a
Adds an observer message for vampires combusting
2015-03-23 22:20:22 -04:00
SamCroswell
b1ae7d37c3
Vampire Holy Water Balancing
2015-03-23 22:14:48 -04:00
Mark van Alphen
bd1e58aa0e
Merge pull request #632 from SamCroswell/master
...
Adds Admin Boozes
2015-03-24 02:45:44 +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
ZomgPonies
a45c9b987d
Merge pull request #633 from Fox-McCloud/Best-Emag-Use
...
Fixes There Not Being a Best Emag Use
2015-03-23 11:13:44 -04:00
Mark van Alphen
69fb729dc1
Merge pull request #626 from Fox-McCloud/Guns-Fixes
...
Teleporter Gun, Fixes, and Tweaks
2015-03-23 15:38:44 +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
2f0c9950ef
Increase weapons costs
2015-03-23 11:43:55 +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
Fox-McCloud
c576402ea9
Fixes There Not Being a Best Emag Use
2015-03-23 01:06:19 -04:00
SamCroswell
02638d1a60
Adds admin boozes
2015-03-22 21:54:49 -04:00
Tigercat2000
76ffbbfd59
Massive spacepod construction overhaul by /VG/
2015-03-23 02:36:49 +01:00
Fox-McCloud
cedb71e8af
Clarity
2015-03-22 20:18:01 -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
Tigercat2000
7b84658a33
Fix giving things to non-carbons
2015-03-22 19:50:55 +01:00
Tigercat2000
86f8ed5111
Fixes related issue with spamclicking lights
2015-03-22 18:36:54 +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
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
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
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
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
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
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
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
Tigercat2000
008cf4d365
Adds pref SOUND_HEARTBEAT
2015-03-17 17:30:28 +01:00
