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

1679 Commits

Author SHA1 Message Date
Fox-McCloud
fb03e1bc88 updates 2015-04-05 17:54:48 -04:00
ZomgPonies
c23f2019fe Merge pull request #725 from Fox-McCloud/brain-damage 
Lethal Brain Damage
 2015-04-04 22:07:39 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud
1a81836556 Lethal Brain Damage 2015-04-04 01:51:04 -04:00
AnturK
2dea395f32 - Adds Picket Signs 2015-04-04 00:07:20 +02:00
Fox-McCloud
0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era 
[Goonchem] Transition to Goonchem
 2015-03-28 12:25:35 -04:00
Fox-McCloud
361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Artorp
046096684b Revert "Change space law iframe wiki link" 2015-03-27 23:53:52 +01:00
Fox-McCloud
a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Cheridan
acba4c6cf6 Adds construction permits 
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
 2015-03-26 18:52:29 +01:00
Fox-McCloud
d90167193a Merge pull request #670 from ZomgPonies/court 
Adds gavel and block to magistrate
 2015-03-26 11:01:35 -04:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
ZomgPonies
d604a50dd8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into court 
Conflicts:
	icons/obj/items.dmi
 2015-03-25 10:23:14 -04:00
ZomgPonies
7fdfa9c6a7 Adding gavel and block 2015-03-25 10:22:04 -04:00
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
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
Fox-McCloud
40b04de8c9 no spinning 2015-03-24 21:42:04 -04:00
ZomgPonies
8dfaa39ecb Updates PR with Fox's suggestions 2015-03-24 19:27:05 -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
Iamgoofball
e5264815ee GOONCHEM 2015-03-24 02:04:47 -07: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
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
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
Fox-McCloud
d0a09c8126 Mindslave, Loyalty, and Knockdown fixes. 2015-03-17 14:01:36 -04: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
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
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
Markolie
80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8 Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/response_team.dm
	maps/cyberiad.dmm
 2015-03-08 18:54:13 +01:00