cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,453 Commits 26 Branches 2 Tags
4d2a77dbf7dd9bbf2f538bfd7aa85031483dde68
Commit Graph

2250 Commits

Author SHA1 Message Date
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
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
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
84a659605d Merge pull request #663 from Iamgoofball/muh_doctors_delight 
MUH FIXES
 2015-03-25 00:18:05 -04:00
Iamgoofball
cea9957062 MUH FIXES 2015-03-24 20:54:59 -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
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
ZomgPonies
8dfaa39ecb Updates PR with Fox's suggestions 2015-03-24 19:27:05 -04:00
Fox-McCloud
6b543f37ff Merge remote-tracking branch 'upstream/master' into Health-Analyzer 2015-03-24 15:53:37 -04:00
ZomgPonies
225a448ea7 Sticking heads on spears 2015-03-24 13:42:33 -04:00
ZomgPonies
3f51d1135a Re-adds old IED recipe, allows IED -> Beartraps 2015-03-24 09:10:10 -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
69bc15604d Health Analyzer Upgrading 2015-03-23 19:44:06 -04: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
Fox-McCloud
aa5cdae070 Taperecorder Rework 2015-03-23 05:45:15 -04: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
ba28d8e5b3 Incendiary Grenade 2015-03-20 17:02:22 -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
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
Markolie
747c2f9a57 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2015-03-17 16:18:42 +01:00
Markolie
12aaa6a93e Bug fixes 2015-03-17 16:16:44 +01:00
ZomgPonies
ad4135e170 Merge pull request #580 from Fox-McCloud/Explosions 
Explosion Tweaks and Fixes
 2015-03-17 08:22:15 -04:00
Fox-McCloud
9fef88f347 Implant Cleanup 2015-03-17 06:30:54 -04:00
Markolie
23bae14e9c Fix monkeys picking up intercoms 2015-03-16 18:52:33 +01:00
Markolie
cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud
645167b49a Explosion Tweaks and Fixes 2015-03-15 18:05:13 -04:00
ZomgPonies
fe2ffc16de Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-09 23:51:01 -04:00
ZomgPonies
b51850dfdd Blueshield access change 2015-03-09 19:01:42 -04:00
FalseIncarnate
e4a5190188 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-08 20:29:07 -04:00
SamCroswell
5bb63a7f63 Merge Conflict Resolution 
Conflicts:
	icons/obj/clothing/gloves.dmi
 2015-03-08 15:59:20 -04:00
Markolie
c09c27958a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	maps/cyberiad.dmm
 2015-03-08 20:10:49 +01:00
Mark van Alphen
71c344013e Merge pull request #518 from ZomgPonies/plasma 
Adds Plasmaman to Karma Shop
 2015-03-08 20:02:16 +01:00
ZomgPonies
b573472e55 Adds missing spacesuits to plasmamen 2015-03-08 14:34:39 -04:00