deathride58
fdb9de488e
Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
...
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
deathride58
d2d9cd7fc2
Update logout.dm
2017-12-14 19:12:27 -05:00
vuonojenmustaturska
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
deathride58
7ca4a29cac
Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
...
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
deathride58
fb492b5a14
Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494
...
[MIRROR] Fixes two unrelated runtimes
2017-12-14 03:54:08 +00:00
Kyle Spier-Swenson
55247e9bdf
Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-13 21:04:00 -06:00
deathride58
b11d1c024e
Merge pull request #4342 from Citadel-Station-13/upstream-merge-33496
...
[MIRROR] Fixes lobby stat entries not showing
2017-12-13 21:48:14 +00:00
Leo
51cce087d8
Fixes two unrelated runtimes
2017-12-13 14:12:26 -06:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
deathride58
dc7dd2da3c
Update dead.dm
2017-12-13 12:05:09 -05:00
Jordan Brown
129cd705d1
Correctly set description of nonstandard cells
2017-12-13 09:12:55 -06:00
Jordan Brown
1bb487ebae
Fixes lobby stat entries not showing
2017-12-12 15:56:38 -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
216b0931d1
Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
...
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
deathride58
94d0293703
Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413
...
[MIRROR] Fix MULEbot ID numbers showing nowhere but the alt-click menu
2017-12-10 22:39:02 +00:00
deathride58
fd3b0c72de
Update say.dm
2017-12-10 17:01:50 -05:00
deathride58
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
deathride58
85ccdac4d7
fixes icon_override only applying to uniforms
2017-12-10 16:37:28 -05:00
jughu
d5472ab6e4
ha ( #33391 )
2017-12-10 13:03:30 -06:00
Tad Hardesty
41b0dbe36f
Fix MULEbot id numbers showing nowhere but the alt-click menu ( #33413 )
2017-12-10 12:55:12 -06:00
deathride58
a17e7ae3cf
Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358
...
[MIRROR] Replace pAI verb tab with an action button
2017-12-10 03:11:54 +00:00
Tad Hardesty
0a71554d7f
Replace pAI verb tab with an action button ( #33358 )
...
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
2017-12-08 22:46:30 -06:00
deathride58
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
deathride58
53ab4feb2f
Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
...
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 18:47:56 +00:00
Dax Dupont
17bb149cd1
Fixes observer versions of sillicon chat ( #33355 )
2017-12-08 12:07:01 -06:00
Jordan Brown
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
Tlaltecuhtli
309f82dc9e
commit ( #33343 )
...
help what is this
2017-12-08 10:34:42 -06:00
Ashe Higgs
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
deathride58
b1852a8c1f
Update login.dm
2017-12-06 13:25:39 -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
deathride58
de4014964f
Update brain_item.dm
2017-12-06 13:21:45 -05:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
deathride58
e7e9a4cc9b
Merge pull request #4245 from Citadel-Station-13/upstream-merge-33182
...
[MIRROR] Fugu improvements
2017-12-06 17:52:03 +00:00
Armhulen
45b9b4956c
Fugu improvements ( #33182 )
...
* come on, you know i wumbo you wumbo he she me wumbo
* it's hip to wumbo
2017-12-06 06:32:50 -06:00
Dax Dupont
4b6660814a
Makes sillicon chat more visible ( #33222 )
...
Made it green on black
Forgot to remove it at the bold thingy
2017-12-06 06:20:27 -06:00
oranges
4b2a1c9d77
Merge pull request #33277 from tgstation/Cyberboss-patch-8
...
Fixes departmental say
2017-12-05 04:08:13 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05: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
