cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,034 Commits 26 Branches 2 Tags
6bfdbdd606ea42637da374ebd322d4df2f94ad8d
Commit Graph

1123 Commits

Author SHA1 Message Date
MrYeti
9f16527552 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:36:12 -05:00
MrYeti
ea1d27a6a2 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:26:47 -05:00
Hawk-v3
3cfb201846 Merge pull request #1839 from AterIgnis/ed209 
ED209 not showing on remote-control chip of security PDA
 2012-11-09 07:42:09 -08:00
Hawk-v3
a114c79aca Merge pull request #1894 from comma/master 
Limb surgery
 2012-11-09 06:52:49 -08:00
Hawk-v3
86f3622d1c Merge pull request #1893 from SniperYeti/master 
Security Belt Modifications
 2012-11-09 06:50:25 -08:00
Hawk-v3
c4c065dfba Merge pull request #1885 from caelaislinn/bs12_with_tgport 
remaining map updates, plus misc
 2012-11-09 06:49:39 -08:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
Chinsky
2bf2d11730 Merge branch 'limbsurgery' 2012-11-09 14:32:22 +04:00
MrYeti
6a129ea312 Update code/game/objects/items/weapons/storage/belt.dm 
Added tasers and stun baton to the security belt and now has 7 slots.
 2012-11-08 22:31:32 -05:00
SkyMarshal
9b3389145e Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. 2012-11-08 14:49:01 -07:00
Chinsky
ef6d50b5c4 Added logging of status screen text change. 2012-11-08 15:44:34 +04:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
Cael_Aislinn
d6b249b945 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-07 15:48:10 +10:00
Chinsky
9dc9198237 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-06 22:41:19 +04:00
Chinsky
1a02f2ff1c Proted instabeams for energy projectiles. 
Also buffed laser damage to pre-merge.
 2012-11-06 20:35:48 +04:00
Cael_Aislinn
0d77854520 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-06 23:04:47 +10:00
Chinsky
5276c85664 medical belts can hold gloves and mask again. 2012-11-06 14:11:31 +04:00
Chinsky
9a4535be69 Added logging of thrower for stunbatons. 2012-11-06 13:29:01 +04:00
SkyMarshal
f66572b6a7 Merge pull request #1879 from comma/master 
Photos and flying batons
 2012-11-06 00:26:00 -08:00
Cael_Aislinn
b72b378f1e cigars and pipes can be lit by means other than matches 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-05 22:24:45 +10:00
Chinsky
5d62b98c18 Added 50% chance of thrown baton to stun mob 2012-11-05 14:46:00 +04:00
SkyMarshal
70c2fb231d Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid 2012-11-04 16:17:35 -07:00
Chinsky
6256200c1a Added ability to clip photos to clipboards. 
Added ability to view photos from clipboards and folders.
 2012-11-04 21:03:17 +04:00
Chinsky
45a6cd0d00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-04 10:03:45 +04:00
Chinsky
d42f601308 Ported photo system. 2012-11-04 09:53:38 +04:00
Hawk-v3
cd641c3370 Merge pull request #1861 from AterIgnis/detonators 
Detonators
 2012-11-03 04:31:16 -07:00
Chinsky
4e6a77edb4 Stopped cig butts falling out of mouths. 2012-11-03 10:37:30 +04:00
Ater Ignis
cbc31b9090 Adjustable timer for default grenades 2012-11-01 21:05:02 +04:00
Ater Ignis
e79df68ef3 added new assembled timer-igniter assembly and added that to default chem-grenades 2012-11-01 17:49:21 +04:00
Chinsky
f9a42f4ba9 ...debug print. 2012-11-01 00:31:36 +04:00
Chinsky
2d216bf746 Fixed bug with unpickable cig butts. 
And just generally got rid of unneeded vars.
 2012-10-30 06:25:32 +04:00
Chinsky
964e28df42 Fixed runtie in cig code. 2012-10-30 01:34:53 +04:00
headswe
9fda27f6a9 Merge pull request #1820 from Spamcat/master 
Alt satchels, adjustable masks, ashtrays.
 2012-10-28 02:33:19 -07:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Spamcat
665c840da3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-26 23:57:05 +04:00
Ater Ignis
d17f1adfab ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected 2012-10-26 15:51:36 +04:00
Ater Ignis
6337048aad updated grenades, now with remote control, proximity control and timer control for your choosing 2012-10-25 19:56:32 +04:00
Spamcat
23960a8064 Cigarette quickfix. 2012-10-23 23:58:11 +04:00
headswe
0d98248b6f Merge pull request #1821 from comma/master 
Pain & Other Ported Things
 2012-10-23 08:47:30 -07:00
Spamcat
7183a7c3d3 Merge https://github.com/Baystation12/Baystation12 2012-10-23 17:56:00 +04:00
Spamcat
512daeeee7 Ported ashtrays, cigs don't produce cigbutt obj when they are put down. 
Added ashtrays to every breakroom.
 2012-10-22 21:41:56 +04:00
Chinsky
b46c887469 Ported implants. 
Compressed matter implant.
Death alarm implant.
Made explosive implant work like pre-merge: trigger on code phrase instead of host's death.
 2012-10-22 17:52:27 +04:00
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
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:35:03 +10:00
Chinsky
ad7cd0ed58 ID biometry. 
Bloodtype, DNA and fignerprint are back to ID
 2012-10-22 00:41:43 +04:00
Chinsky
5e4273c919 Fixed runtime in secure briefcase code. 2012-10-21 17:58:54 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
giacomand@gmail.com
6616314ca6 -Cleaned up Simple Animals by having a hostile class which will handle standard attacking, then the childs of that class can override the procs to do something different, if needed. 
-Cameras won't shock you anymore, when cutting the power wire.
-Cultists cannot be gibbed by placing more runes that is allowed, instead it says no and to clear any unused runes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4926 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 01:31:41 +00:00