cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,462 Commits 26 Branches 2 Tags
67e2f35f49acfc833f6597ff890df8811b8f25d0
Commit Graph

10794 Commits

Author SHA1 Message Date
Markolie
67e2f35f49 Ore redemption screwdriver fix 2015-09-18 18:29:05 +02:00
Markolie
44607294fa Player panel fix 2015-09-18 18:16:28 +02:00
Markolie
a52b371e22 Flavor text examine fix 2015-09-18 18:16:20 +02:00
Fox-McCloud
6a79ff83a1 Merge pull request #2090 from Markolie/fixesss 
Radio examine/matter eater fix, GC testing move
 2015-09-18 01:20:27 -04:00
Mark van Alphen
739e820faa Merge pull request #2078 from Fox-McCloud/experimentor 
EXPERI-Mentor Addition--Telesci Removal
 2015-09-18 07:18:55 +02:00
Markolie
5ee3320e1a Stop matter eaters from eating their own limbs and constructs and other important mobs whole 2015-09-18 07:14:07 +02:00
Markolie
d8ad34ee17 Item examine fix, GC testing move 2015-09-18 06:42:46 +02:00
Mark van Alphen
df5dd46ac9 Merge pull request #2086 from Fox-McCloud/oh-no-protolathe 
Further Protolathe Fixes
 2015-09-18 05:27:19 +02:00
Fox-McCloud
7c7838445f Merge pull request #2089 from Markolie/fixesss 
Fixesss
 2015-09-17 23:25:01 -04:00
Markolie
938641678b Remove old find_references proc 2015-09-18 05:17:24 +02:00
Markolie
9ffd7de976 Add reference collection to garbage collector 2015-09-18 05:01:53 +02:00
Fox-McCloud
d234a50b16 Further Protolathe Fixes 2015-09-17 20:07:58 -04:00
Fox-McCloud
a788d22e7e Merge pull request #2077 from Markolie/languages 
Language fixes
 2015-09-17 16:30:45 -04:00
Mark van Alphen
d02fcc6aed Merge pull request #2079 from Fox-McCloud/reagent-GC 
Fixes Reagents GCing and Runtimes
 2015-09-17 22:12:59 +02:00
Markolie
82b3d8c469 Temporarily revert language fix pending language prefix rewrite 2015-09-17 18:30:53 +02:00
Fox-McCloud
a35a8cef1b Protolathe Fix 2015-09-17 03:43:36 -04:00
Fox-McCloud
02b0edb6ed Fixes Reagents GCing and Runtimes 2015-09-17 03:00:05 -04:00
Fox-McCloud
a24b91d369 reagent amounts adjustment 2015-09-17 02:08:20 -04:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Markolie
67d1cafc29 Language fixes 2015-09-17 03:42:14 +02:00
Fox-McCloud
ce91a30da3 Merge pull request #2071 from Markolie/lawstate2 
Update additional law channel handling, debug fix
 2015-09-16 20:53:04 -04:00
Fox-McCloud
b53a5a69e1 Merge pull request #2057 from Markolie/notes 
Player notes update
 2015-09-16 20:46:09 -04:00
Markolie
783afaf944 Remove double sanitization, update example config 2015-09-17 02:38:44 +02:00
Markolie
af9339f36f Correct i variable 2015-09-17 01:55:51 +02:00
Markolie
bdf43b0fc4 Add mass note conversion proc 2015-09-17 01:50:13 +02:00
Mark van Alphen
bb1d3362f3 Merge pull request #2074 from tigercat2000/why 
I have no idea why you would ever sanitize() say, it already strips html
 2015-09-17 01:07:56 +02:00
Fox-McCloud
bef21a964d Merge pull request #2068 from Markolie/lawstate 
Welding tool refactor, in-hand updates
 2015-09-16 19:07:29 -04:00
Tigercat2000
63a47eeca4 I have no idea why you would ever sanitize() say, it already strips html 2015-09-16 15:31:25 -07:00
Markolie
62235dc859 Wand and Thompson in-hands 2015-09-16 23:12:49 +02:00
Mark van Alphen
8625c7f8f0 Merge pull request #2060 from Fox-McCloud/ore-materials 
Adds Materials to Ore
 2015-09-16 20:22:54 +02:00
Mark van Alphen
d708ee8d84 Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup 
Cluster Grenade Cleanup
 2015-09-16 20:22:38 +02:00
Markolie
7b6dee1f6b Update additional law channel handling 2015-09-16 18:27:46 +02:00
Fox-McCloud
cf21717a76 Merge pull request #2055 from Markolie/lesser 
Switch spray admin messages to attack messages
 2015-09-15 22:04:21 -04:00
Markolie
611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
Markolie
0741669bd6 Implement remove_item_from_storage properly, syndi toolbox tool color update 2015-09-16 01:54:34 +02:00
Markolie
0db98340f8 Further welding tool updates 2015-09-16 01:37:07 +02:00
Markolie
951b58af5a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate 
Conflicts:
	code/game/objects/items/weapons/tools.dm
 2015-09-16 01:32:33 +02:00
Markolie
aeabab7248 Welding tool refactor, in-hand updates 2015-09-16 01:27:15 +02:00
Fox-McCloud
894d13fa4d Merge pull request #2065 from Markolie/lawstate 
Fixes
 2015-09-15 17:42:34 -04:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Markolie
914b3742ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate 2015-09-15 23:06:56 +02:00
Markolie
5e856a0aaf Law manager channel fixes 2015-09-15 23:02:04 +02:00
Fox-McCloud
fbcae579a4 Tails Notification Hotfix 2015-09-15 16:24:00 -04:00
Fox-McCloud
873f209079 Merge pull request #1997 from tigercat2000/sneks 
Alternate tail/body/whatever-can-fit-on-the-tail-layer system
 2015-09-15 16:20:16 -04:00
Fox-McCloud
3aa9563f2b Merge pull request #2049 from Markolie/display 
Display case update
 2015-09-15 16:02:43 -04:00
Markolie
7ff5704565 Extra sanity check 2015-09-15 21:25:43 +02:00
Markolie
a09b295890 Make savefile-->SQL note converter functional 2015-09-15 21:19:19 +02:00
Markolie
5fbbd39cbc Notes IRC fix, add rights checks to watchlist/note procs 2015-09-15 19:21:56 +02:00
Markolie
e64ac23677 Further display case improvements 2015-09-15 18:47:19 +02:00
Tigercat2000
d0cd123ac0 Bayxamine: WEAPONS\! 2015-09-15 09:10:17 -07:00