 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
|
22fb76980b
|
Didn't mean to remove that
|
2015-09-18 05:07:29 +02:00 |
|
|
Markolie
|
fe60284923
|
Comment out testing
|
2015-09-18 05:06:34 +02:00 |
|
|
Markolie
|
2e064a1050
|
Fix Wizard infinite spell exploit
|
2015-09-18 05:03:17 +02:00 |
|
|
Markolie
|
becb3e729d
|
Fix broken tile stacks
|
2015-09-18 05:02:29 +02:00 |
|
|
Markolie
|
832c94ca64
|
Fix syringe gun in-hand
|
2015-09-18 05:02:13 +02:00 |
|
|
Markolie
|
9ffd7de976
|
Add reference collection to garbage collector
|
2015-09-18 05:01:53 +02:00 |
|
|
Markolie
|
d921f473f1
|
Air alarm fixes
|
2015-09-18 05:01:33 +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
|
f4f42ab17b
|
Make meteors not collide with eachother
|
2015-09-17 18:32:39 +02:00 |
|
|
Markolie
|
82b3d8c469
|
Temporarily revert language fix pending language prefix rewrite
|
2015-09-17 18:30:53 +02:00 |
|
|
Mark van Alphen
|
873e4ed2a7
|
Merge pull request #2080 from Fox-McCloud/protolathe-fix
Protolathe Fix
|
2015-09-17 17:18:47 +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
|
8fcc671a69
|
MetaStation Lab Update
|
2015-09-17 01:37:06 -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 |
|
|
Fox-McCloud
|
4d16ae9e78
|
Merge pull request #2075 from Markolie/lawstate
Add dmisort.sh script, and sorts all icons in .dmi files
|
2015-09-16 20:21:07 -04:00 |
|
|
Fox-McCloud
|
96030a706a
|
Merge pull request #2069 from Markolie/computor
Reduce computer lights, air alarm fix
|
2015-09-16 20:05:48 -04: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 |
|
|
Markolie
|
935ab6bc61
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
Conflicts:
icons/obj/toy.dmi
|
2015-09-17 01:12:09 +02:00 |
|
|
Markolie
|
d8f98d6082
|
Add dmisort.sh script, and sorts all icons in .dmi files
|
2015-09-17 01:08:58 +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
|
0244ad2309
|
Add the dmitool (from Bay)
|
2015-09-17 00:20:12 +02:00 |
|
|
Markolie
|
62235dc859
|
Wand and Thompson in-hands
|
2015-09-16 23:12:49 +02:00 |
|
|
Mark van Alphen
|
02921fea74
|
Merge pull request #1971 from Regen1/mechweapons
Mech weapons spawn in lockboxes framework
|
2015-09-16 21:17:27 +02:00 |
|
|
Regen
|
e77752d5fb
|
Removes locks, keeps framework
|
2015-09-16 21:11:52 +02:00 |
|
|
Mark van Alphen
|
feff96184a
|
Merge pull request #2061 from Fox-McCloud/handbiting
Removes Handchewing While Cuffed
|
2015-09-16 20:23:14 +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
|
5d80c7a248
|
Add rights check to debug logging
|
2015-09-16 18:35:42 +02:00 |
|
|
Markolie
|
7b6dee1f6b
|
Update additional law channel handling
|
2015-09-16 18:27:46 +02:00 |
|
|
Fox-McCloud
|
8061dbf7c3
|
Merge pull request #2059 from Ultimate-Chimera/master
Adds a toxins and burn medkit to the mining outpost and adds in a xenomorph toy! (Take 2)
|
2015-09-16 08:33:05 -04:00 |
|