cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,504 Commits 14 Branches 2 Tags
7dc292f47293c3be17f8bb64ea9899d95eb361d2
Commit Graph
20504 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ZomgPonies 7dc292f472 Merge pull request #696 from Fox-McCloud/Goon-tweaks 
[Goonchem] Tweaks, Fixes, etc.
 2015-03-28 23:23:47 -04:00
ZomgPonies 40926b5c86 Merge pull request #697 from Fox-McCloud/Spinning 
You Spin Me Right Round
 2015-03-28 23:23:37 -04:00
Fox-McCloud d4de91ce15 You Spin Me Right Round 2015-03-28 23:17:00 -04:00
Fox-McCloud 7dc856c86c Merge pull request #686 from tigercat2000/CryoSpritey 
Cryo will now show occupant inside on sprite. (Bayport)
 2015-03-28 22:57:08 -04:00
Fox-McCloud d1c2a78b81 Syndicate Shuttle Donks 2015-03-28 22:46:49 -04:00
Fox-McCloud 796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
Fox-McCloud 3a31f763c8 Merge pull request #693 from SamCroswell/MapEdits 
Admin Room Map Fix, Adds Admin Room Detainment
 2015-03-28 19:41:08 -04:00
SamCroswell d4c9700265 Admin Room Map Fixes 2015-03-28 18:56:58 -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
ZomgPonies e9a83bc54c Merge pull request #685 from Artorp/revert-359-master 
Revert "Change space law iframe wiki link"
 2015-03-28 12:24:50 -04:00
Tigercat2000 4259e589a2 Sprite stuff for cryo 2015-03-28 11:36:09 +01:00
Fox-McCloud a98b79728d formaldehyde 2015-03-28 06:08:32 -04:00
Fox-McCloud 361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Fox-McCloud 6b96276637 hypospray tweaks 2015-03-28 05:03:37 -04:00
Fox-McCloud 1e7c0a4825 fixes 2015-03-28 04:34:48 -04:00
Tigercat2000 5253f58700 betterer sprites, bob animation 2015-03-28 03:50:23 +01:00
Fox-McCloud 1100adf179 Merge pull request #75 from Iamgoofball/muh_oop 
OOP shock and reagents, buffs overdose effects on meth, too many yakkity saxxers
 2015-03-27 21:53:06 -04:00
Iamgoofball b58a76e4e0 FUCK 2015-03-27 18:44:42 -07:00
Iamgoofball 4a88b9b3f7 OOP shock and reagents, buffs overdose effects on meth, too many yakkity saxxers 2015-03-27 17:57:11 -07:00
ChinskyandTigercat2000 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 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
CheridanandTigercat2000 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 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