vuonojenmustaturska
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
deathride58
5535509a65
fixes broken metabolism
2017-12-12 15:15:22 -05:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
LetterJay
85578cae0d
Merge pull request #4316 from deathride58/iconoverridefix
...
Fixes icon_override only applying to uniforms
2017-12-10 17:15:13 -06:00
deathride58
fd3b0c72de
Update say.dm
2017-12-10 17:01:50 -05:00
deathride58
85ccdac4d7
fixes icon_override only applying to uniforms
2017-12-10 16:37:28 -05:00
deathride58
a59207aa84
Update say.dm
2017-12-06 13:24:14 -05:00
deathride58
caefd58dc7
Update life.dm
2017-12-06 13:23:36 -05:00
deathride58
2269de43f6
Update species.dm
2017-12-06 13:22:51 -05:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
deathride58
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
deathride58
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
deathride58
b9731895fd
Merge pull request #4076 from Citadel-Station-13/upstream-merge-32858
...
[MIRROR] Divides species in subtypes, makes viruses able to infect certain subtypes
2017-12-04 21:57:29 +00:00
deathride58
1a40fe16bd
adds species_organic to cit races
2017-12-04 16:38:39 -05:00
QualityVan
4f8323a735
Fixes missing eyes being absent ( #33203 )
2017-12-04 04:50:55 -06:00
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
LetterJay
6fe319af5a
Merge pull request #4183 from Citadel-Station-13/upstream-merge-33191
...
[MIRROR] Fixes a division by zero in humans' ex_act()
2017-12-03 06:13:43 -06:00
LetterJay
624b570763
Merge pull request #4173 from Citadel-Station-13/upstream-merge-33120
...
[MIRROR] Makes glasses handle both nearsightedness and eye damage
2017-12-03 06:06:33 -06:00
Jordan Brown
4489843fd6
Merge pull request #33191 from vuonojenmustaturska/bombmemes
...
Fixes a division by zero in humans' ex_act()
2017-12-02 09:43:51 -06:00
oranges
6949c2e2a5
Merge pull request #33120 from QualityVan/glasses
...
Makes glasses handle both nearsightedness and eye damage
2017-11-30 19:22:02 -06:00
Robustin
56969e2541
Moderate Damage Examination ( #33008 )
...
Ok so the last one only worked on carbons who weren't humans, woops. See: #32707
🆑 Robustin
tweak: Damage examinations now include a "moderate" classification. Before minor was <30 and severe was anything 30 or above. Now minor is <25, moderate is 25 to <50, and severe is 50+.
/🆑
2017-11-30 19:16:40 -06:00
deathride58
2e708d49c2
Merge pull request #4123 from Citadel-Station-13/upstream-merge-32993
...
[MIRROR] A few investigate_log and message_admin fixes
2017-11-27 05:18:12 +00:00
ShizCalev
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
Jordie
4053499c83
A few investigate_log and message_admin fixes
2017-11-24 22:42:01 -06:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
29d4b023f0
Update podpeople.dm
2017-11-22 17:51:36 -05:00
deathride58
6bfba3ea03
Update lizardpeople.dm
2017-11-22 17:50:23 -05:00
deathride58
93a2d653bf
Update humans.dm
2017-11-22 17:48:56 -05:00
deathride58
3f07d95b56
Update corporate.dm
2017-11-22 17:46:40 -05:00
oranges
7c1fe79635
Merge pull request #32943 from ShizCalev/alium-softcrit-sprite
...
Fixes aliums showing wrong sprite in softcrit
2017-11-22 15:37:57 -06:00
XDTM
783960a986
Divides species in subtypes, makes viruses able to infect certain subtypes
2017-11-22 15:36:43 -06:00
deathride58
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
aedf16a76e
merges #4011
2017-11-21 15:07:31 -05:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
checkraisefold
e3036f6eae
fix 'cannot scream while unconscious' bug ( #32814 )
...
* fix 'cannot scream while unconscious' bug
fixes a bug where it tells you that you can't scream while unconscious while on fire (experienced on Bagil when a plasma fire happened at endround shuttle)
* Update species.dm
* sanitize code
* add the comment back so people know what it doin
* change operator
other one wouldn't work with the fix, the screaming is supposed to happen while you're in crit
2017-11-18 13:52:36 -06:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
deathride58
d202867730
Update carbon.dm
2017-11-17 23:23:13 -05:00
deathride58
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
deathride58
805eaedd5a
Update lizardpeople.dm
2017-11-16 12:42:38 -05:00
deathride58
a488e7cf07
Update lizardpeople.dm
2017-11-16 12:38:11 -05:00
LetterJay
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay
2715fd1b6c
Merge pull request #3950 from deathride58/slimernosliming
...
Re-disables slimeperson splitting
2017-11-15 10:54:51 -06:00
LetterJay
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
LetterJay
3c28ea5426
Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277
...
[MIRROR] Removes golem debug code that spams world
2017-11-15 10:30:31 -06:00
LetterJay
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
deathride58
f1274b41f2
redisables slime splitting
2017-11-14 19:27:19 -05:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
Robustin
2fc1e5c8e5
More nuanced damage examination ( #32707 )
...
* More nuanced damage examinations
* Tweaking examination values
* Redundancy Removal
2017-11-14 13:48:20 -06:00
