cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,736 Commits 29 Branches 2 Tags
62fb3c29813e2894de6aa13c5653900aa51e3f72
Commit Graph

10968 Commits

Author SHA1 Message Date
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
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
Mark van Alphen
cbb2a16409 Merge pull request #2046 from Fox-McCloud/tech-shell-balance 
Tech Shells: Silver Removal
 2015-09-15 17:36:57 +02:00
Fox-McCloud
844d203d0e cleanup and restructure 2015-09-15 06:52:06 -04:00
Fox-McCloud
de98aa2b9d Adds Materials to Ore 2015-09-15 06:08:20 -04:00
Fox-McCloud
76eb759ff6 Merge pull request #2043 from tigercat2000/autohiss 
Autohiss + Baydev language update.
 2015-09-15 00:16:41 -04:00
Fox-McCloud
1979043d84 Cluster Grenade Cleanup 2015-09-15 00:04:57 -04:00
Markolie
ccab45c495 Mods have notes access 2015-09-15 05:21:03 +02:00
Markolie
3ff3945bab Player notes update 2015-09-15 05:10:03 +02:00
Markolie
bbfc8f5c5b Remove another obsolete icon_override 2015-09-15 04:27:09 +02:00
Markolie
be5653a25f Get rid of item_override 2015-09-15 04:20:46 +02:00
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
 2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746 Merge pull request #2040 from Markolie/guns 
Guns update
 2015-09-14 22:11:33 -04:00
Mark van Alphen
54ba4bf878 Merge pull request #2054 from Fox-McCloud/powernet-cleanup 
Powernet Datum Destroying
 2015-09-15 04:01:53 +02:00
Markolie
fae3e78270 Switch spray admin messages to attack messages 2015-09-15 04:01:19 +02:00
Fox-McCloud
e3a6bf535f Powernet Datum Destroying 2015-09-14 21:54:21 -04:00
Fox-McCloud
be375d98b9 Merge pull request #2014 from veganzombeh/virus1 
pAIs can no longer force people on help intent to pick them up.
 2015-09-14 20:38:10 -04:00
Fox-McCloud
bde7e6bc42 Merge pull request #2037 from Markolie/CMA 
Add Sergeant Araneus
 2015-09-14 20:37:59 -04:00
TheDZD
cdc6c74384 Merge pull request #2045 from Fox-McCloud/reagents-performance 
Reagents Performance and Garbage Collection
 2015-09-14 19:11:52 -04:00
Tigercat2000
f01b8f122c Remove snake body until better sprite can be found 2015-09-14 15:44:34 -07:00
Fox-McCloud
47cab7ed38 Merge pull request #2053 from Markolie/lesser 
Fixes
 2015-09-14 18:03:49 -04:00
veganzombeh
351beaad3f Fixes indentation 2015-09-14 21:49:59 +01:00
Markolie
7a0c1bae77 Fix ore redemption deconstruction 2015-09-14 22:26:09 +02:00
Markolie
84c60aa560 Monkey/human transform fixes 2015-09-14 22:13:32 +02:00
Markolie
0c991f7092 Nuke code admin check fix 2015-09-14 22:13:18 +02:00
Tigercat2000
e7434fa9a6 Bayxamine - Weapons thingy mod #commitname 2015-09-14 12:40:15 -07:00