cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 20:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
eaeb8a1bd6d8720a26c604512859c4e1c40eecd9
Paradise/code/game/objects/items
History
cib 422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
..
devices
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-11-13 19:01:03 +01:00
robot
Can attach limbs now. No preparations needed yet.
2012-11-07 20:01:55 +04:00
stacks
merge fixes
2012-10-22 20:25:27 +10:00
weapons
Balancing for genetics side-effects:
2012-11-11 18:51:02 +01:00
apc_frame.dm
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
2012-09-04 22:19:03 +10:00
blueprints.dm
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
2012-09-04 22:19:03 +10:00
bodybag.dm
More file structure stuff!
2012-08-26 03:32:58 +00:00
candle.dm
More file structure stuff!
2012-08-26 03:32:58 +00:00
crayons.dm
More file structure stuff.
2012-08-26 01:20:02 +00:00
item.dm
Added attack logging, some moderator groundwork, fixed alien species and save files.
2012-09-23 21:49:25 +01:00
latexballoon.dm
More file structure stuff!
2012-08-26 03:32:58 +00:00
shooting_range.dm
Proted instabeams for energy projectiles.
2012-11-06 20:35:48 +04:00
tk_grab.dm
I started with the desire to fix issue 634. It sounded like a simple issue, right? Well one complete rewrite of how equipping and stripping works later, this commit fixes issue 645
2012-08-15 23:15:55 +00:00
trash.dm
Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
2012-10-15 23:17:18 +10:00