comma
625eecddaa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pain
...
Conflicts:
html/changelog.html
2013-08-04 00:43:10 +04:00
comma
1bca7c7454
Made character HUD show pain level instead of actual health.
...
Pain are calculated based on health, but all damages contribute differently, for example 50u burn will feel like 100u, but 50u poisoning would only feel like 25u.
2013-08-04 00:12:38 +04:00
Zuhayr
840e4b7a7d
Deleted a redundant file.
2013-08-04 01:45:20 -07:00
Zuhayr
610a3210e0
Continued species rewrite. Modified life.dm, moved species.dm around due to define issue.
2013-08-04 01:40:09 -07:00
Zuhayr
b875ff021b
Vast array of changes to replace mutantrace with species datum
2013-08-03 15:08:54 -07:00
Zuhayr
11621e3f8c
Added pressure and temperature variables to species, checked them in life() to determine damage by-species.
2013-08-03 14:04:37 -07:00
Zuhayr
197f2a3e8b
Commented out luchador string replacement.
2013-08-03 12:52:10 -07:00
Zuhayr
dec28dda86
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-03 12:41:46 -07:00
Zuhayr
27f7d1580d
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-02 20:16:50 -07:00
Zuhayr
618afa1be7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6
Merge.
2013-08-03 09:14:20 -07:00
Segrain
826ce1c0f1
Fixes for handling embedded objects.
2013-08-02 19:32:58 +03:00
Segrain
fb4552f394
Fix for #3383 . Again.
2013-08-01 17:15:16 +03:00
comma
95f00d0523
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks
2013-08-01 10:03:46 +04:00
Zuhayr
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07:00
comma
de1309102e
Splints!
...
Actually added 2 commits before, but now with full capabilities.
2013-08-01 05:58:55 +04:00
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Zuhayr
2644684a81
Proper runtime fix for ablative armour and tasers.
2013-07-31 07:30:57 -07:00
Zuhayr
486f46d71e
Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint.
2013-07-31 04:17:17 -07:00
Zuhayr
361ecb4e2b
Merge resolution.
2013-07-30 17:33:18 -07: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
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
