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 |
|
vuonojenmustaturska
|
7f90427a40
|
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
|
2017-12-13 13:56:57 -06:00 |
|
Jordan Brown
|
129cd705d1
|
Correctly set description of nonstandard cells
|
2017-12-13 09:12:55 -06: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 |
|
deathride58
|
ccd370328c
|
Merge branch 'master' into upstream-merge-33316
|
2017-12-11 00:01:02 +00:00 |
|
deathride58
|
cdc23ad79e
|
Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265
[MIRROR] Good Clean Fun: A vending machine for games!
|
2017-12-10 23:50:05 +00:00 |
|
deathride58
|
57ab98d8bc
|
Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
[MIRROR] Airlock Construction Update
|
2017-12-10 23:49:51 +00:00 |
|
deathride58
|
bfa573f4bd
|
Update alarmlock.dm
|
2017-12-10 17:46:50 -05:00 |
|
deathride58
|
7179547be4
|
Merge branch 'master' into upstream-merge-31727
|
2017-12-10 21:51:51 +00:00 |
|
uraniummeltdown
|
d6b0683846
|
Airlock Construction Update
|
2017-12-10 15:23:34 -06:00 |
|
Anonmare
|
52da86e214
|
Fixes booze-o-mats not having booze (#33418)
* Update vending.dm
* Update vending.dm
* Update vending_items.dm
* Adds a missing close parenthisis
* I'm drunk and blind, don't sue me
* Update vending_items.dm
* Update vending_items.dm
|
2017-12-10 13:20:06 -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 |
|
Jordan Brown
|
f3fd81af24
|
Adds games vendor resupply crate
|
2017-12-06 22:53:21 -06: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 |
|
XDTM
|
988dbe87da
|
Brain Traumas
|
2017-12-06 12:05:20 -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 |
|
coiax
|
1cc3e865bf
|
Good Clean Fun: A vending machine for games!
|
2017-12-05 17:20:21 -06: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 |
|