This website requires JavaScript.
5433b320bf
Merge pull request #6036 from Citadel-Station-13/cloak
2018-03-21 07:59:07 -05:00
d95d734b14
Adds lights to the bridge on Omega
2018-03-21 01:04:05 -05:00
b569465705
Adds lights to the bridge on Omega (#36537 )
2018-03-20 21:26:54 -04:00
613d54ad4e
Update __donator.dm
2018-03-21 00:36:40 -05:00
8797bdace1
donator cloak thing, going to bed
2018-03-21 00:29:11 -05:00
8377bdf9a8
fixes some screen issues
2018-03-20 23:53:55 -05:00
f3a806923c
Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop
2018-03-20 23:00:12 -05:00
b80e7cded9
fixes #5996
2018-03-20 19:18:33 -05:00
61fde978e1
Tennis Balls! (and donator stuff) (#5962 )
2018-03-21 08:11:34 +08:00
2bb09bef5f
Adds additional screen 'faces', allows switching of screens in game
2018-03-20 13:53:52 -05:00
0d4e7f73f4
Merge pull request #6031 from Citadel-Station-13/upstream-merge-36466
2018-03-20 15:56:27 +00:00
3aca9ea2af
Merge pull request #6030 from Citadel-Station-13/upstream-merge-36523
2018-03-20 15:54:29 +00:00
af82e1109f
slight tweaks, revert job controller changes, penor layering tweaked
2018-03-20 10:41:36 -05:00
9517e3ad2e
Merge pull request #5990 from Poojawa/digileg-runtime
2018-03-20 15:26:43 +00:00
3a5fbcf15e
Update _unit_tests.dm
2018-03-20 11:11:41 -04:00
15109ad50a
Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar
2018-03-20 10:10:36 -05:00
089c2e70b2
fixes runtime in donator
2018-03-20 09:34:22 -05:00
0832bb62c3
Unit test to make sure all subsystems which initialize call parent
2018-03-20 09:01:46 -04:00
0c38958d95
Fix N2 filter in deep storage ruin
2018-03-20 07:53:55 -05:00
47850573b0
Fix N2 filter in deep storage ruin (#36523 )
2018-03-20 05:54:03 -07:00
e01a0d521d
Update shockcollar.dm
2018-03-19 23:44:13 -05:00
6cd994d342
[MIRROR] Colour fix (#6024 )
2018-03-19 22:18:28 -05:00
9f182d89ed
[MIRROR] Distinguishes law types by colour (#6022 )
2018-03-19 22:17:24 -05:00
7b3b1f65ec
[MIRROR] Adds two new intermediate beaker types to chemistry (#6018 )
2018-03-19 22:17:05 -05:00
7c8c8f3a0a
[MIRROR] Engie goggles in Meson mode now respect light levels (#6028 )
2018-03-19 21:44:30 -05:00
0016b323f6
[MIRROR] Lowers damage cap on breaking hacked apcs (#6026 )
2018-03-19 21:44:19 -05:00
8cbdf9fcb4
Merge branch 'master' into digileg-runtime
2018-03-19 21:33:50 -05:00
dad2d44ea2
[MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992 )
2018-03-19 21:33:18 -05:00
088f3fda5d
Gives a prompt for people to see who is replying to an mhelp (#5963 )
2018-03-19 21:27:41 -05:00
36ba7312c7
Re-recorded the piano instrument to sound better! (hopefully) (#6027 )
2018-03-19 21:27:17 -05:00
980d69dde3
[MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000 )
2018-03-19 21:25:01 -05:00
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines (#6004 )
2018-03-19 21:18:57 -05:00
9338d18a28
[MIRROR] Techweb fixes (#6023 )
2018-03-19 21:18:35 -05:00
b74454bf5c
[MIRROR] Tweaks to ERT creation (#6021 )
2018-03-19 21:18:02 -05:00
fcbc76a7a9
[MIRROR] Pacifists can now use mech drills on closets containing living beings (#6020 )
2018-03-19 21:16:44 -05:00
889ff6fa08
[MIRROR] circuit diagnostic status icon changes (#6019 )
2018-03-19 21:16:26 -05:00
c8004a088e
[MIRROR] Crayons and spraycans can no longer infinitely draw large graffiti (#6001 )
2018-03-19 21:16:00 -05:00
df15bbe0f0
[MIRROR] New & Fixed AI VOX Sound Files (#6003 )
2018-03-19 21:15:34 -05:00
1d6d8b454c
[MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017 )
2018-03-19 21:12:46 -05:00
0c1fc7ff61
[MIRROR] Gives warning message to holodeck mobs that gain sentience via sentience potions. (#6016 )
2018-03-19 21:12:21 -05:00
51a7f39176
[MIRROR] Updates rhumba beat to be more different from GBS (#6015 )
2018-03-19 21:11:54 -05:00
009f95db42
[MIRROR] Electronic assembly changes and additions (#6014 )
2018-03-19 21:11:23 -05:00
6aaef3b010
[MIRROR] Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs] (#6013 )
2018-03-19 21:08:54 -05:00
fd63838558
[MIRROR] Circuits constants chips now keep their data on save/load (#6012 )
2018-03-19 21:08:24 -05:00
dac99faf65
[MIRROR] Brain Damage Trait (#6011 )
2018-03-19 21:07:57 -05:00
e6cee90e4c
[MIRROR] Adds missing space to lobby music toggle (#6010 )
2018-03-19 21:07:36 -05:00
777a4473d8
[MIRROR] Fixes roundend report runtmining if no traitor had a uplink. (#6009 )
2018-03-19 21:07:18 -05:00
26e1aec9d8
[MIRROR] Massively slows Spaceacillin metabolism (#6005 )
2018-03-19 21:06:56 -05:00
1fd5de5bfe
[MIRROR] Fixes stacks and material containers, fixes wet floors (#6008 )
2018-03-19 21:06:33 -05:00
c17da68be6
[MIRROR] Removes completely unnecessary block of code in reactions.dm (#6007 )
2018-03-19 21:06:01 -05:00
6010376cd8
Lemmie know if these need to be pushed higher.
2018-03-19 19:57:16 -05:00
d593e46c6b
working as intended now and improved
2018-03-19 07:00:05 -05:00
b27c5cd3b0
Revert "SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress."
2018-03-19 05:32:12 -05:00
e44c644e87
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
2018-03-19 05:30:42 -05:00
a2fbab5ccb
SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress.
2018-03-19 04:57:57 -05:00
d387481aa5
UI's functional again at least
2018-03-19 02:13:47 -05:00
b6c780df30
reee
2018-03-19 01:02:04 -05:00
4f07c9f856
Merge pull request #5995 from Citadel-Station-13/donator
2018-03-18 22:03:11 -05:00
4db062c9c0
didn't fix anything, reee. but I have an idea
2018-03-18 20:20:20 -05:00
6ee530b30a
die
2018-03-18 20:16:50 -05:00
9e072fe328
Update __donator.dm
2018-03-18 19:28:51 -05:00
46733bca65
type path
2018-03-18 16:54:43 -05:00
f55ad18f69
fk
2018-03-18 15:54:43 -05:00
e163a889fb
i hate this shit
2018-03-18 15:53:20 -05:00
18759e03b3
op
2018-03-18 15:47:48 -05:00
380ec76618
sabre and sheath
2018-03-18 12:18:08 -05:00
8304a40969
probably fixes bad loadout tab things
2018-03-18 11:34:57 -05:00
acfee53a98
:HELP: MAINT
2018-03-18 11:26:00 -05:00
796e22beac
LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
2018-03-18 09:02:13 -05:00
5d2ec7dd88
clear_event not add_event
2018-03-17 20:31:59 -05:00
d6e7dcdf37
Merge branch 'master' into digileg-runtime
2018-03-17 20:16:21 -05:00
27ec18988a
wew
2018-03-17 20:14:15 -05:00
d3407f1711
a few other little runtimes
2018-03-17 20:03:21 -05:00
c8365e6be7
Hunts down some runtimes
2018-03-17 19:38:03 -05:00
02c3f6d0a0
Merge pull request #5985 from Citadel-Station-13/upstream-merge-36399
2018-03-18 00:18:55 +00:00
082d36fa6b
Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
2018-03-17 23:58:15 +00:00
087255b1f1
Merge pull request #5904 from Poojawa/sprite-tweaks
2018-03-17 23:57:16 +00:00
542208445b
Merge pull request #5901 from NopeMcHaltman/cit_mood
2018-03-17 23:56:50 +00:00
f74aa475c1
Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449
2018-03-17 23:55:32 +00:00
79db79f630
Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437
2018-03-17 23:54:50 +00:00
a9f8c70d62
Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364
2018-03-17 23:54:33 +00:00
d2926f3ba9
Merge pull request #5984 from Citadel-Station-13/upstream-merge-36470
2018-03-17 23:54:16 +00:00
df8fe921cc
Merge pull request #5983 from Citadel-Station-13/upstream-merge-36478
2018-03-17 23:53:57 +00:00
50a05952d2
Merge pull request #5982 from Citadel-Station-13/upstream-merge-36475
2018-03-17 23:53:32 +00:00
fa62612298
Merge pull request #5980 from Citadel-Station-13/upstream-merge-36438
2018-03-17 23:53:10 +00:00
d30be811be
Merge pull request #5979 from Citadel-Station-13/upstream-merge-36410
2018-03-17 23:52:52 +00:00
fe801a89ac
Merge pull request #5978 from Citadel-Station-13/upstream-merge-36401
2018-03-17 23:51:56 +00:00
8b2aa30d6f
Merge pull request #5977 from Citadel-Station-13/upstream-merge-36443
2018-03-17 23:51:37 +00:00
a93edc6e17
Merge pull request #5976 from Citadel-Station-13/upstream-merge-36422
2018-03-17 23:51:20 +00:00
0f5b8c228e
Merge pull request #5975 from Citadel-Station-13/upstream-merge-36419
2018-03-17 23:50:59 +00:00
238c8b24e2
Merge pull request #5974 from Citadel-Station-13/upstream-merge-36425
2018-03-17 23:50:30 +00:00
b8d6bc53cf
Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432
2018-03-17 23:50:10 +00:00
304ac2f89c
Merge pull request #5972 from Citadel-Station-13/upstream-merge-36446
2018-03-17 23:49:53 +00:00
f5e49123e0
Merge pull request #5971 from Citadel-Station-13/upstream-merge-36409
2018-03-17 23:49:23 +00:00
1fc5fe361c
Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393
2018-03-17 23:49:02 +00:00
b9a73ded87
Update coil.dm
2018-03-17 19:48:42 -04:00
c00c135ed4
Merge pull request #5969 from Citadel-Station-13/upstream-merge-36371
2018-03-17 23:47:47 +00:00
fc59e7d42f
Merge pull request #5968 from Citadel-Station-13/upstream-merge-36079
2018-03-17 23:47:29 +00:00
b0f4508392
Merge pull request #5967 from Citadel-Station-13/upstream-merge-36130
2018-03-17 23:47:15 +00:00
f817344a7f
Merge pull request #5966 from Citadel-Station-13/upstream-merge-36154
2018-03-17 23:46:28 +00:00
LetterJay