cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-20 19:41:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 12 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
ZomgPonies
3665d7fd31 Removing the unneeded limbpain count 2015-03-24 23:02:35 -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
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
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
ZomgPonies
8dfaa39ecb Updates PR with Fox's suggestions 2015-03-24 19:27:05 -04: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
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
6770819ae8 Limb overhaul first comit 2015-03-24 08:38:33 -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
29767f82e9 Thrown Object Spinning 2015-03-24 01:16:50 -04: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
Fox-McCloud
14ae3d22dd Airflow Damage Hotfix 2015-03-23 15:27:07 -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
ZomgPonies
a9658989b6 Merge pull request #629 from tigercat2000/portgetPixelDistance 
Ports getPixelDistance() from -tg-
 2015-03-23 11:13:26 -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
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
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
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