cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,566 Commits 26 Branches 2 Tags
cf5bfcaac124f482d1cffd51c4990cd667ab4e80
Commit Graph

4664 Commits

Author SHA1 Message Date
Markolie
bf2cabeca3 Tab 2015-09-23 03:08:38 +02:00
Markolie
b770e8f2a0 Implant fixes/updates 2015-09-23 02:51:33 +02:00
Markolie
df8209afe6 Atmos fixes 2015-09-22 05:15:05 +02:00
Markolie
3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-09-22 00:17:30 +02:00
Mark van Alphen
78ad7adafa Merge pull request #2111 from Fox-McCloud/russian-revolver 
Adds in Russian Revolvers
 2015-09-21 23:01:58 +02:00
Markolie
ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Fox-McCloud
bd3696523b GC a few Datums 2015-09-20 22:40:13 -04:00
Fox-McCloud
e371c9662a Merge pull request #2106 from Markolie/pipenet 
Pipenet revamp
 2015-09-20 20:47:02 -04:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
Fox-McCloud
941e833290 suicide act for the suicide game 2015-09-20 09:13:51 -04:00
Fox-McCloud
17d38f81c6 Adds in Russian Revolvers 2015-09-20 08:56:11 -04:00
Fox-McCloud
3777639425 Fixes Utensil Feeding 2015-09-19 05:14:25 -04:00
TheDZD
268992a32f Merge pull request #2081 from Fox-McCloud/borg-update 
Borg Update: MMI and Suits
 2015-09-18 22:31:21 -04:00
TheDZD
7e9b2f99b1 Merge pull request #2091 from Fox-McCloud/destroy-them-all 
Fixes up a few Destroys
 2015-09-18 22:30:49 -04:00
TheDZD
b27753e163 Merge pull request #2088 from Fox-McCloud/point-rework 
Point Rework
 2015-09-18 22:30:22 -04:00
Fox-McCloud
56ed8c1a7e Pass III 2015-09-18 21:15:08 -04:00
TheDZD
942c1abc76 Merge pull request #2082 from Fox-McCloud/syndi-ship-update 
Syndicate Ship Update
 2015-09-18 18:54:59 -04:00
Fox-McCloud
1d91e31d17 pass II, taperecorder exploit fix 2015-09-18 05:46:00 -04:00
Fox-McCloud
74565c101b Fixes up a few Destroys 2015-09-18 04:20:02 -04: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
d8ad34ee17 Item examine fix, GC testing move 2015-09-18 06:42:46 +02:00
Markolie
becb3e729d Fix broken tile stacks 2015-09-18 05:02:29 +02:00
Fox-McCloud
480613208d Point Rework 2015-09-17 22:26:03 -04:00
Fox-McCloud
73087a89bb runtime fixes, pick name re-addition 2015-09-17 19:23:49 -04:00
Fox-McCloud
2d52bd90e1 Syndicate Ship Update 2015-09-17 08:22:50 -04:00
Fox-McCloud
b01d49d72c Borg Update: MMI and Suits 2015-09-17 06:50:24 -04:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -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