cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,742 Commits 26 Branches 2 Tags
bd6b9cceebc1eb708dc2fa5caa2a9ff69fb0592e
Commit Graph

3096 Commits

Author SHA1 Message Date
Zuhayr
c361e6f4b7 Commented out debug string. 2013-07-29 16:55:03 -07:00
Zuhayr
6c53208115 Taser and examine fixes. 2013-07-29 16:50:37 -07:00
Zuhayr
2d45713d69 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-07-29 15:47:44 -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
af1f0108a2 Armalis pinning fix. 2013-07-29 07:06:55 -07:00
Segrain
3c4b7507e9 Reactiveness 'quick'fix. 2013-07-28 13:02:10 +03:00
Kilakk
d7d84ff515 Added a deadchat toggle for all players. 
* Both admins and regular players can toggle deadchat off
* Having deadchat on still requires you to be a ghost or an admin/mod to be able to /see/ deadchat
 2013-07-27 22:54:30 -04:00
Zuhayr
e16d06d469 Merged setup.dm. 2013-07-28 08:46:10 -07:00
Zuhayr
0c88896adf Adds a vox heist game mode. Fairly complex. 2013-07-28 05:18:04 -07:00
Segrain
914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Segrain
93955846fa Robotic cameras. 2013-07-28 00:37:29 +03:00
Mloc
1aed76d4c2 Merge pull request #3369 from softmix/dev 
Made always random name respect gender
 2013-07-27 04:59:37 -07:00
Mloc
94ec875852 Merge pull request #3364 from Kilakk/dev 
Gave ghosts their own emote proc, added colorful text to distinguish emotes made by ghosts.
 2013-07-27 04:59:16 -07:00
Zuhayr
b8d13e1c7e Merged robot.dm 2013-07-27 02:09:44 -07:00
Peter Wall
5e91c569cc Made always random name respect gender 2013-07-27 10:09:58 +02:00
Zuhayr
b0d8ee7861 Merge resolution. 2013-07-26 23:17:48 -07:00
Kilakk
f66e571696 Added /mob/dead/observer/emote() 
* Added a proc to be called whenever a ghost emotes something
* Added emote_dead, which displays the *fancy* emote text to admins, mods, and those with M.stat DEAD
 2013-07-26 23:04:49 -04: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
9d2e107005 Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-25 18:30:24 +01:00
Jamini
920b855f6c Added employment records. 
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.

Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-07-24 22:23:50 -04:00
Kilakk
52ac0fdf31 Added crew manfiest verb for ghosts. 
Made the silicon crew manfiest monochrome, because why not?
 2013-07-23 19:11:30 -04: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