cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 05:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 26 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

22199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iamgoofball
4a88b9b3f7 OOP shock and reagents, buffs overdose effects on meth, too many yakkity saxxers 2015-03-27 17:57:11 -07:00
Chinsky
e364c3b560 Cryo will now show occupant inside on sprite. 2015-03-28 01:48:18 +01:00
Artorp
046096684b Revert "Change space law iframe wiki link" 2015-03-27 23:53:52 +01:00
Fox-McCloud
5ad8e57ac5 Merge pull request #679 from tigercat2000/ConstructPermits 
Construct permits (Port from -tg-)
 2015-03-27 17:30:37 -04: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
Tigercat2000
202f8e81d8 Make actually work, grgrgr. 2015-03-26 21:03:23 +01:00
Cheridan
6796dcce29 Adds logging, fixes typo 2015-03-26 20:11:02 +01:00
Tigercat2000
b4a2d26274 fixstrangestuff 2015-03-26 20:10:45 +01:00
Cheridan
d012d77a7d Spirit Boards! 
Conflicts:
	icons/obj/objects.dmi
	tgstation.dme
 2015-03-26 20:00:44 +01:00
Tigercat2000
b8101ed6be w_classes, NEED W_CLASSES, gaah. 2015-03-26 19:21:32 +01:00
Tigercat2000
62f72163c7 Compileerrorfix, update items.dmi 2015-03-26 19:00:25 +01:00
Tigercat2000
18072a8539 Replace other instances of item/blueprint 2015-03-26 18:55:31 +01: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
Mark van Alphen
07c09335b9 Merge pull request #677 from Artorp/mapfix 
Mechanic Workshop mapfix
 2015-03-26 18:51:20 +01:00
Artorp
83a397869e Mechanic Workshop mapfix 
Adds missing cable and pipe
 2015-03-26 17:25:27 +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
ZomgPonies
9f3d0675d7 Merge pull request #675 from fj45/master 
Minor visual update to MISC testing.
 2015-03-26 10:55:35 -04:00
ZomgPonies
e8936c5aec Merge pull request #674 from Fox-McCloud/borg-defib 
Borg Defib Fixes
 2015-03-26 10:55:09 -04:00
ZomgPonies
52ac2d5090 Merge pull request #673 from Fox-McCloud/superhair 
[Goonchem] Further Goonchem Changes
 2015-03-26 10:53:49 -04:00
Fox-McCloud
b358a8ba1d oops 2015-03-26 10:31:13 -04:00
Fox-McCloud
56d6d7c9c8 Fixes 2015-03-26 10:27:04 -04:00
Fox-McCloud
abf409149d more tweaks and additions 2015-03-26 09:43:13 -04:00
fj45
a47c50889b I have no idea what I am doing. 2015-03-26 15:20:30 +08:00
fj45
56fc0ca1be Revert "Fixed the DIR issue.....???" 
This reverts commit 8a55c808a8.
 2015-03-26 15:13:42 +08:00
fj45
8a55c808a8 Fixed the DIR issue.....??? 
That or screwed up everything.
 2015-03-26 14:18:11 +08:00
fj45
a774854e47 Fixed three missing areas. 2015-03-26 13:24:52 +08:00
fj45
f86b19666d Minor visual update to Misc Testing 
Did add two firefighting lockers, have to give the idiots half a chance!
 2015-03-26 13:18:16 +08:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
Fox-McCloud
29ab8700e9 adjustments 2015-03-25 23:30:47 -04:00
ZomgPonies
616aecd461 Merge pull request #672 from Fox-McCloud/Sarin-Fix 
[Goonchem] Sarin Fix
 2015-03-25 20:51:40 -04:00
Fox-McCloud
e0bf463504 [Goonchem] Hairgrownium Change 2015-03-25 18:26:40 -04:00
Fox-McCloud
f3dcb69c4b [Goonchem] Sarin Fix 2015-03-25 17:15:49 -04:00
ZomgPonies
d8feaab17f Compile fix 2015-03-25 15:42:06 -04:00
ZomgPonies
71b2c1621a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into limb 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2015-03-25 15:16:51 -04:00
ZomgPonies
971ecc06a9 Forgot a file 2015-03-25 15:04:31 -04:00
ZomgPonies
18239091a7 2 new ways of losing limbs! 2015-03-25 15:03:46 -04:00
ZomgPonies
6c5230e19f Adds gavel and block to magistrate office 2015-03-25 10:30:19 -04:00
ZomgPonies
1753406811 Fix missing gauze sprite 2015-03-25 10:25:28 -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
de86bc0843 Merge pull request #664 from Fox-McCloud/Prox-Mine 
Prox Mine Fix
 2015-03-25 09:35:05 -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
ZomgPonies
0b92c311df Merge pull request #666 from Fox-McCloud/Goonchem-Additions 
[Goonchem] Few Additional Chemicals
 2015-03-25 09:33:11 -04:00
Fox-McCloud
279ea75e62 Touch Ups 2015-03-25 09:12:10 -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