cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 22:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,851 Commits 26 Branches 2 Tags
e79df68ef30b3bc625d83d58beee03d34412a714
Commit Graph

7 Commits

Author SHA1 Message Date
Cael_Aislinn
c0e7ad00b2 merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:25:27 +10:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:15:05 +10:00
giacomand@gmail.com
d5422f6a7e -Grilles can now be destroyed by fires. 
-Added a define for the minimum amount of damage a mob takes from plasma.
-Increased it to 20, from 10.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4931 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 19:03:50 +00:00
Chinsky
a4142fa098 Throwing metal (with non-zero m_amt) items will make electrified doors and grilles spark. 2012-10-17 00:09:49 +04:00
baloh.matevz
e6197c2bae - Committing the updated recursive explosion code. It now takes into account objects too. 
The following objects affect explosions: (Doors only when closed)

Poddoor = 25
R-Wall = 25
Airlock = 15
Space = 10
Wall = 5
Window door = 5
Grille = 5
Plastic flaps = 5
Floor = 1

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4585 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-08-30 05:38:10 +00:00
giacomand@gmail.com
a1695cb5ff -Added a purchasing log for uplinks. To view it, view the variables of the item with the uplink, navigate to hidden_uplink, click on it and then look at the purchase log variable. 
-Sorted the following admin commands/verbs:
Get Key, Get Mob, Jump to Area, Jump to Key, Jump to Mob, Player Panel, Player Panel New, Send Mob, Show Player Panel, Show Traitor Panel
-Because of the recent player poll, electrified grilles will now shock you when you bump into them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4560 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-08-27 07:57:49 +00:00
johnsonmt88@gmail.com
1a8fb7c09e Another small chunk of reorganizing objects. 
I've cleared out most of the .dm files in code/game/objects/ and put it into appropriate files/folders. The stuff I've left is stuff I believe may conflict with carn's work and some code for stuff that does not have a home yet.

TODO:
- Files that were left in code/game/objects that may conflict with carns work
- Go through all the files in all the subfolders of code/game/objects.
- Move all the defines from /defines/ to their proper spots

Not much right?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4520 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-08-22 21:55:46 +00:00