cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-31 01:22:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,434 Commits 12 Branches 2 Tags
edbfacb33cda5f87a20491a3db7dfd95183bc65b
Commit Graph

18112 Commits

Author SHA1 Message Date
Markolie
edbfacb33c Remove mundane carp event 2015-09-17 19:03:03 +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
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
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
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
Fox-McCloud
311cd79e5c More Grenades 2015-09-16 00:00:07 -04: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
Fox-McCloud
9ca7d1002d one last grenade 2015-09-15 21:48:53 -04:00
Markolie
5564f3da5b Add missing variables 2015-09-16 03:37:51 +02:00
Markolie
611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
Markolie
9a81ab2e39 Minor adjustment to server room temperature min2 2015-09-16 02:41:21 +02:00
Markolie
637bbecfd1 Reduce computer lights 2015-09-16 01:57:31 +02:00
Markolie
0741669bd6 Implement remove_item_from_storage properly, syndi toolbox tool color update 2015-09-16 01:54:34 +02:00
Markolie
2098933ee4 welding_fuel fix 2015-09-16 01:37:51 +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
d7d0573a50 Fix aliens crawling through welded scrubbers 2015-09-15 23:05:28 +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
Fox-McCloud
5bec1b3780 Merge pull request #2048 from Markolie/computor 
Lower the layer of computer overlays
 2015-09-15 16:01:20 -04:00
Fox-McCloud
f4daac4275 Merge pull request #2047 from Markolie/cargo 
Update cargo shipping manifest
 2015-09-15 16:01:06 -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
98f2976739 Missing " 2015-09-15 18:50:57 +02:00
Markolie
0db5d89354 Notice --> Danger 2015-09-15 18:48:58 +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
Tigercat2000
b403183d0e Bayxamine: No cloneX. 2015-09-15 09:05:07 -07:00
Markolie
c43987fe3c Make Poly sit on computers again 2015-09-15 17:41:15 +02:00