6957a6f13f
Merge branch 'master' into upstream-merge-34105
2018-01-08 20:03:41 +00:00
1e9598dfbd
Clean up a bunch of undefined arg runtimes
2018-01-07 20:53:12 -06:00
66f0a9c2b7
mob living silicon
2018-01-04 01:06:25 -05:00
3208404f14
Merge pull request #33580 from Xhuis/defenses_balancing
...
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
f093bb8fec
Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856
...
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
2017-12-29 06:22:35 -06:00
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
b03a8a70db
Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442
...
[MIRROR] [READY]Adds picking up corgis and pAIs!
2017-12-29 06:47:17 +00:00
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
3df98e631b
Fixes compiling errors
2017-12-28 16:13:30 -05:00
2fdb9e598f
Modularizes dogborgs, adds new alternate skins for some modules, and more!
2017-12-28 15:50:33 -05:00
bf7838aded
[READY]Adds picking up corgis and pAIs!
2017-12-27 15:47:57 -06:00
752e3f7378
Fixes AI camera lights not updating when tracking mobs ( #33849 )
2017-12-26 18:30:24 -06:00
5dd7136225
Merge branch 'master' into upstream-merge-33590
2017-12-25 21:29:18 -06:00
af1f13e114
Merge pull request #33306 from coiax/replace-clean-flag-with-component
...
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-23 08:36:37 -06:00
bec20087c2
[READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-22 10:58:13 -06:00
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
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
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
129cd705d1
Correctly set description of nonstandard cells
2017-12-13 09:12:55 -06:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
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
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
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
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
17bb149cd1
Fixes observer versions of sillicon chat ( #33355 )
2017-12-08 12:07:01 -06:00
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
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
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
ceee0c80e7
okay ( #33058 )
2017-11-24 22:39:44 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
15165d970d
Update inventory.dm
2017-11-20 22:29:55 -05:00
3aefa4a907
Update cameranet.dm
2017-11-20 22:29:15 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
591efe27a3
Update robot_modules.dm
2017-11-18 00:19:35 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
deathride58