cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,434 Commits 26 Branches 2 Tags
2d52bd90e1712a282e8a67256ef55c89fbe6ffbe
Commit Graph

4637 Commits

Author SHA1 Message Date
Fox-McCloud
2d52bd90e1 Syndicate Ship Update 2015-09-17 08:22:50 -04: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
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
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
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
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
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
5e856a0aaf Law manager channel fixes 2015-09-15 23:02:04 +02:00
Fox-McCloud
3aa9563f2b Merge pull request #2049 from Markolie/display 
Display case update
 2015-09-15 16:02:43 -04: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
Fox-McCloud
37b215c8f2 Removes Handchewing While Cuffed 2015-09-15 07:38:24 -04: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
Ultimate Chimera
4b95dfd1ff Adds in a Xenomorph Toy and adds the much needed Burns and Toxins kit to the Mining Outpost medbay! 2015-09-14 23:42:52 -06:00
Fox-McCloud
ff265d95d3 re-adding old grenades 2015-09-15 01:20:13 -04:00
Mark van Alphen
1539a4d1e8 Merge pull request #2041 from Fox-McCloud/backpacks 
Backpack Storage Rework
 2015-09-15 06:58:44 +02:00
Fox-McCloud
3e0a6d286d tweaks 2015-09-15 00:12:41 -04:00
Fox-McCloud
1979043d84 Cluster Grenade Cleanup 2015-09-15 00:04:57 -04: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
Tigercat2000
0603f73232 Bay12 examine overhaul. 
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
 2015-09-14 11:51:40 -07:00
Markolie
59b78376e9 Display case update, some forceMove updates 2015-09-14 20:21:56 +02:00
Mark van Alphen
b7b07c95ba Merge pull request #2024 from Fox-McCloud/racks 
Table Rack Destruction
 2015-09-14 18:43:43 +02:00
Fox-McCloud
1e1c667ad5 Backpack Storage Rework 2015-09-13 23:22:09 -04:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie
2cf27f9255 Get rid of two obsolete overrides 2015-09-13 23:03:16 +02:00
Markolie
2b23ba0048 In-hands can now be any size 2015-09-13 23:00:31 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Markolie
aaeac981b9 Temperature gun update 2015-09-13 21:05:23 +02:00
Fox-McCloud
f68518e3c1 Table Rack Destruction 2015-09-13 01:59:13 -04:00
Fox-McCloud
25c35343dc materials-consitency 2015-09-12 16:22:39 -04:00
Markolie
d5a3fb57ea Add cooldown to pAI card/drone reactivations 2015-09-11 06:51:14 +02:00
Mark van Alphen
84b42c5491 Merge pull request #1986 from Fox-McCloud/nuke-and-tator 
Nuke Ops and Traitor Update+Balance
 2015-09-10 02:24:32 +02:00
Mark van Alphen
69139c1bef Merge pull request #1993 from Fox-McCloud/rad-laser-fix 
Rad Laser Fix
 2015-09-10 01:14:38 +02:00
Mark van Alphen
e499554fef Merge pull request #1984 from Fox-McCloud/mining-voucher 
Adds Mining Voucher to QM's locker
 2015-09-10 01:13:58 +02:00
Fox-McCloud
5b160f78f4 topic-fixup 2015-09-09 17:49:27 -04:00
Fox-McCloud
d70c166109 Rad Laser Fix 2015-09-09 17:00:53 -04:00