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 |
|
Jordan Brown
|
8f71b88a87
|
Merge pull request #33318 from AutomaticFrenzy/patch/vendor
Fix vending machines nullspacing every item on init
|
2017-12-06 22:48:42 -06:00 |
|
deathride58
|
c1cd970cc4
|
Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274
[MIRROR] Removes ComponentActivated in favor of callbacks
|
2017-12-06 03:53:35 +00:00 |
|
Jordan Brown
|
e1f658a50d
|
Removes ComponentActivated in favor of callbacks
|
2017-12-05 15:42:47 -06:00 |
|
Jordan Brown
|
d37e2a3363
|
Fix some unquoted list associations (#33290)
|
2017-12-05 15:31:05 -06:00 |
|
deathride58
|
a6aa181161
|
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
[MIRROR] Moves some machine sprites into /machines/ folder
|
2017-12-05 20:37:30 +00:00 |
|
ACCount
|
435e46e407
|
Moves some machine sprites into /machines/ folder
|
2017-12-05 03:24:03 -06:00 |
|
oranges
|
4204c889ed
|
Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
|
2017-12-05 03:23:06 -06:00 |
|
deathride58
|
f57e02ce95
|
Merge branch 'master' into donoritemmodularization
|
2017-12-04 20:17:02 -05:00 |
|
deathride58
|
21d5e8999c
|
Merge branch 'master' into upstream-merge-32624
|
2017-12-04 17:12:53 -05:00 |
|
AnturK
|
1cc3e33714
|
Holorecord disks.
|
2017-12-04 05:14:13 -06:00 |
|
Leo
|
6d8d9802d4
|
Merge pull request #33153 from AnturK/adv_cam_cleanup
Fixes some advanced camera issues
|
2017-11-30 17:00:46 -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 |
|
Jordan Brown
|
89d3e37e1a
|
Merge pull request #33140 from Wad67/master
Check door for (welded) upon closing
|
2017-11-28 06:29:17 -06:00 |
|
Cruix
|
b23c92b056
|
Added bot path data huds
|
2017-11-28 06:28:40 -06:00 |
|
ShizCalev
|
5abd1bcdd9
|
Cleans up some qdel(src)'s in Initialize()
|
2017-11-26 20:15:18 -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 |
|
Armhulen
|
d9c650970c
|
making prs isn't even worth it anymore (#33056)
|
2017-11-24 22:36:22 -06:00 |
|
Leo
|
541b8db684
|
Merge pull request #32985 from YPOQ/airlockfix
Fixes AIs being unable to interact with unscrewed airlocks
|
2017-11-24 14:11:39 -06:00 |
|
ShizCalev
|
12aa356f10
|
Updates some item drops to use drop_location()
|
2017-11-24 12:59:33 -06:00 |
|
ACCount
|
2147c60b7f
|
Replaces "console screen" stock part with glass sheets
|
2017-11-23 18:53:47 -06:00 |
|
deathride58
|
f83ce9cd11
|
Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937
[MIRROR] Simple wall turret buff
|
2017-11-24 00:19:24 +00:00 |
|
Jordan Brown
|
8943bf0184
|
Merge pull request #33041 from MrStonedOne/patch-452
Lowers the stress the dna console puts on the string tree
|
2017-11-23 12:07:17 -06:00 |
|
deathride58
|
c76cacdf77
|
Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
[MIRROR] [READY]NTnet refactor, assimilates exonet
|
2017-11-23 01:40:54 +00: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
|
b6630b41d1
|
merges #3877 proper
|
2017-11-22 17:37:22 -05:00 |
|
oranges
|
c2c22d56c7
|
[READY]NTnet refactor, assimilates exonet
|
2017-11-22 15:52:54 -06:00 |
|
oranges
|
cec6c028f5
|
[READY]Refactors uplinks to a component!
|
2017-11-22 15:17:03 -06:00 |
|
AnturK
|
64c7fa0cfd
|
Simple wall turret buff (#32937)
* Simple wall turret buff
* Adds mapper support
|
2017-11-22 12:44:59 -06:00 |
|
deathride58
|
4b284f2e0d
|
Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773
[MIRROR] Integrated circuit fixes and code improvements
|
2017-11-21 19:59:38 +00:00 |
|
deathride58
|
1f6b3ce629
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-21 19:53:58 +00:00 |
|
ACCount
|
8a64287249
|
Integrated circuit fixes and code improvements
|
2017-11-21 03:04:17 -06:00 |
|
ShizCalev
|
35af5e49aa
|
Fixes computers deleting on build (#32942)
* Fixes computers deleting on build
* Removed src
|
2017-11-21 02:43:34 -06:00 |
|
deathride58
|
d2b251d23c
|
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
[MIRROR] Cleans up unused code
|
2017-11-21 04:15:11 +00:00 |
|
deathride58
|
f9b5c04cd3
|
Update buildandrepair.dm
|
2017-11-20 13:45:39 -05:00 |
|
Jordan Brown
|
2498e1ddc0
|
Cleans up unused code
|
2017-11-20 10:14:32 -06:00 |
|
ShizCalev
|
aea13f75cd
|
Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location()
|
2017-11-20 03:08:10 -06:00 |
|
deathride58
|
44287392a4
|
Merge pull request #4022 from Citadel-Station-13/upstream-merge-32889
[MIRROR] Makes some turning procs consistently turn clockwise
|
2017-11-20 05:48:20 +00:00 |
|
deathride58
|
1356356740
|
Update doppler_array.dm
|
2017-11-20 00:05:43 -05:00 |
|
Jordie
|
571985ca5d
|
Merge pull request #32864 from ike709/dir
Fixes some computer dirs
|
2017-11-19 22:42:28 -06:00 |
|
Jordie
|
752bc654ae
|
Makes some turning procs consistently turn clockwise
|
2017-11-19 22:25:17 -06:00 |
|
JJRcop
|
ca9834613c
|
Removes duplicate data for ai airlock menu (#32843)
|
2017-11-18 13:51:27 -06:00 |
|
deathride58
|
1d841ce65a
|
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
[MIRROR] RPD ui improvements
|
2017-11-18 05:40:13 +00:00 |
|
deathride58
|
a15007cd5a
|
Merge pull request #3992 from Citadel-Station-13/upstream-merge-32761
[MIRROR] Tweaks AI door open and close buttons
|
2017-11-18 05:39:22 +00:00 |
|
deathride58
|
04d290aa11
|
Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775
[MIRROR] Makes the operation computer tgui
|
2017-11-18 05:38:59 +00:00 |
|
deathride58
|
eeba86e27e
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-18 05:31:42 +00:00 |
|
deathride58
|
9e78bcd8f9
|
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
|
2017-11-18 05:29:32 +00:00 |
|
deathride58
|
e478e5640a
|
Update tracking.dm
|
2017-11-17 23:20:15 -05:00 |
|
CitadelStationBot
|
0beef30fb7
|
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993)
|
2017-11-17 19:02:40 -08:00 |
|
duncathan salt
|
52fc5e8bc6
|
RPD ui improvements
|
2017-11-17 18:03:56 -06:00 |
|