cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,731 Commits 29 Branches 2 Tags
cfc7dc73d9f17293eadda93ad568a26dbe50ddef
Commit Graph

3085 Commits

Author SHA1 Message Date
Zuhayr
cfc7dc73d9 Merge pull request #3465 from DJSnapshot/new_player 
Changes to new_player.dm
 2013-08-08 16:08:31 -07:00
DJSnapshot
0feea48cf8 Changed observe button warning to reflect 30 minute wait time. 2013-08-08 14:32:44 -07:00
Akai Alonkai
2db7beb19c Removed Z-up function from Client/Center() 
Turns out this was allowing mecha to travel semi-unrestricted upwards
through z-levels, including to Central Command and the Away Mission.
 2013-08-06 10:46:23 -04:00
comma
e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Segrain
fb4552f394 Fix for #3383. Again. 2013-08-01 17:15:16 +03:00
Segrain
578a020c8b Fix for #3392. 2013-07-30 12:15:12 +03:00
Zuhayr
a39aff3471 Removed a very very redundant check in the ablative armour code. Thanks Segrain. 2013-07-29 12:51:20 -07:00
Zuhayr
b1ac1d58f9 Fixes #3383 2013-07-29 12:15:04 -07:00
Segrain
ea320dca67 Conflict fix? 2013-07-29 08:15:54 +03:00
Segrain
da2786891a Fix for #3337. 2013-07-29 08:12:02 +03:00
Zuhayr
1670ed8051 Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices. 2013-07-27 01:08:27 -07:00
Zuhayr
37aef47198 Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode. 2013-07-27 00:48:50 -07:00
Mloc-Argent
09db9f1ff0 Nerfed snoring frequency. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-23 23:38:49 +01:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Zuhayr
7faf895563 Robots will now spawn fully equipped. 2013-07-13 04:35:50 -07:00
Zuhayr
71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Mloc
1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +01:00
Mloc-Argent
b5c63c2a66 I have honestly no idea what happened there. Fucking git. 
This reverts commit a2fddc0fc1.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:31:26 +01:00
Mloc-Argent
c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01:00
Mloc-Argent
66a8536c94 Revert "Adds in the icon files for Kidan and fixes issue" 
This reverts commit 9139a70d8c.
 2013-07-12 12:22:58 +01:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
Zuhayr
a8a474bca9 Changed combat module to VV only pending rebalancing. 2013-07-10 07:20:06 -07:00
Segrain
21ac3e5954 Fix for #3286. 2013-07-09 21:08:31 +03:00
comma
d5942c4b10 Updated HUDs to find only known viruses. 2013-07-09 13:04:05 +04:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
comma
ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2013-07-09 12:48:34 +04:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain
72588c8c61 MedHUDs and virus2. 2013-07-09 04:51:09 +03:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Spamcat
c8eb9df6ac How do I grammar? 2013-07-08 22:56:35 +04:00
Spamcat
0e153b7226 Updated pulse checking on examine, optimized handle_pulse(), fixed some grammer. 
xoxo chinsky
 2013-07-08 22:37:54 +04:00
Mloc-Argent
3ce4e2ad17 Fixes #2559 
Changes Add-Note and Notes verb to be under the IC category, instead of OOC.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-06 22:20:13 +01:00
Zuhayr
b84697055f Embedded item string fix. 2013-07-07 00:07:18 -07:00
Zuhayr
587b2d8f24 Cyborg sprite selection fix. 2013-07-07 00:00:25 -07:00
Zuhayr
ee560d43da Allowed ties to use mask sprites if equipped to the face, for accessories like lockets. 2013-07-06 23:53:24 -07:00
Segrain
a2d3edcaff More fixes. 2013-07-05 21:56:25 +03:00
Segrain
5abed5a5f6 Modtype tweak. 2013-07-05 20:10:39 +03:00
Zuhayr
349851313e Typo. 2013-07-05 23:34:44 -07:00
Zuhayr
aeec95b350 Robot immortality fixes. 2013-07-05 23:31:27 -07:00
Zuhayr
0cfaf8e70b Minor string fix. 2013-07-05 22:15:40 -07:00
Zuhayr
a2249fb1dc Fixes yank out verb string issues. 2013-07-05 22:01:09 -07:00
cib
f10c08253f Fixed two bugs with robot components. 
1. They could be broken but still powered.
2. Melee damage didn't work at all.
 2013-07-05 13:43:11 +02:00
Spamcat
f7dc8f8c0a derp 2013-07-05 04:50:18 +04:00
Spamcat
3a1ea41ff2 Moar machinery. 2013-07-05 04:39:57 +04:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Spamcat
6e61fe3914 Initial pulse code. WIP 2013-07-05 03:11:50 +04:00
Zuhayr
a8ea0a3fd4 Bot shield not working against melee fix. 2013-07-04 23:23:22 -07:00
Zuhayr
dc3485ab2d Indenting issue. 2013-07-04 20:37:10 -07:00
Zuhayr
0852a9f4b1 Partial fix for #3236 2013-07-04 20:34:37 -07:00
Zuhayr
0140738157 Merge branch 'BEF-staging' of https://github.com/Baystation12/Baystation12 2013-07-04 20:26:55 -07:00