oranges
4b2a1c9d77
Merge pull request #33277 from tgstation/Cyberboss-patch-8
...
Fixes departmental say
2017-12-05 04:08:13 -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
deathride58
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
deathride58
1a32bdc053
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
...
[MIRROR] Datumizes saymodes
2017-12-04 21:19:53 +00:00
QualityVan
4f8323a735
Fixes missing eyes being absent ( #33203 )
2017-12-04 04:50:55 -06:00
deathride58
222346bf30
Update say.dm
2017-12-03 18:29:08 -05: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
MoreRobustThanYou
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
LetterJay
c5f0b380cd
Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157
...
[MIRROR] Clean up some loc assignments
2017-12-03 06:14:34 -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
vuonojenmustaturska
9f9582ba5e
Clean up some loc assignments ( #33157 )
2017-12-02 09:44:20 -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
4eceef7693
Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967
...
[MIRROR] Added bot path data huds
2017-11-30 04:34:25 +00:00
deathride58
4ff2063a4a
Update sloth.dm
2017-11-28 22:19:08 -05:00
Kyle Spier-Swenson
ad135a57a3
Makes the sloth an actual sloth
2017-11-28 19:02:45 -06:00
Cruix
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
vuonojenmustaturska
f685f4bd1a
Removes one source of decal/cleanable qdel failures ( #33083 )
...
* remove one source of qdel memes
* pls
* A housekeeping thing for the ignore list, also removes effectively unused var
* whoops
2017-11-27 05:30:08 -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
deathride58
1d8618eaca
Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
...
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
deathride58
d5eef89e13
Update parrot.dm
2017-11-26 21:26:35 -05:00
deathride58
12cb0a98a4
Update headcrab.dm
2017-11-26 21:25:51 -05:00
deathride58
90e13d0053
Update creature.dm
2017-11-26 21:25:13 -05:00
deathride58
e5e17cf334
Update bear.dm
2017-11-26 21:24:27 -05:00
deathride58
c67063beb5
Update lizard.dm
2017-11-26 21:23:50 -05:00
deathride58
e70daa585c
Update fox.dm
2017-11-26 21:23:26 -05:00
deathride58
eb13f4ee2f
Update farm_animals.dm
2017-11-26 21:22:42 -05:00
deathride58
933b4a7a3a
Update crab.dm
2017-11-26 21:21:55 -05:00
deathride58
4e2db63a33
Update cat.dm
2017-11-26 21:21:28 -05:00
ShizCalev
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
ShizCalev
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
deathride58
14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
Jordie
4053499c83
A few investigate_log and message_admin fixes
2017-11-24 22:42:01 -06:00
Armhulen
ceee0c80e7
okay ( #33058 )
2017-11-24 22:39:44 -06:00
deathride58
f92bc0c938
Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805
...
[MIRROR] Refactor on_reagent_change to pass through the change type
2017-11-24 23:47:13 +00:00
deathride58
837779b683
Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025
...
[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
deathride58
9b52d847a7
Merge pull request #4105 from Citadel-Station-13/upstream-merge-33024
...
[MIRROR] Makes reverse pulling only apply to dense objects
2017-11-24 23:13:28 +00:00
deathride58
72bc951aa2
Merge pull request #4103 from Citadel-Station-13/upstream-merge-33004
...
[MIRROR] If a client mob ends up in nullspace with no admins on a message is sent to chat
2017-11-24 23:11:58 +00:00
Armhulen
a12a12b550
comma splice and ellipsis grammar fix ( #33040 )
...
* :*)
* i think this fixes splice
2017-11-24 15:21:11 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
MoreRobustThanYou
3757be6ce2
Makes reverse pulling only apply to dense objects ( #33024 )
...
* Makes reverse pulling only apply to dense objects
* CACHE CACHE CACHE!
2017-11-24 13:00:10 -06:00
Jordan Brown
fe1d69c35d
IRC message if client mob ends up in nullspace ( #33004 )
...
Only if no admins are online
2017-11-24 12:59:54 -06:00
ShizCalev
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
deathride58
ad3608caeb
Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699
...
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
2017-11-23 01:03:38 +00:00
