eb722bf59f
Merge branch 'master' into upstream-merge-33045
2017-11-24 00:10:36 +00:00
b2bb942817
Fixes component runtimes
2017-11-23 13:12:38 -06:00
598f0dc580
Merge pull request #32979 from tgstation/Cyberboss-patch-4
...
Adds some sanity checks to component creation
2017-11-23 05:47:32 -06:00
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
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
2e9f3bc1c0
Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968
...
[MIRROR] Fixes bartender suit having an adjust state
2017-11-22 20:50:45 +00:00
11ecf4d922
Merge pull request #4066 from Citadel-Station-13/upstream-merge-32701
...
[MIRROR] Refactor chasm paths to be more sane
2017-11-22 19:40:55 +00:00
06b86e54b3
Adds round ID to status topic ( #32976 )
2017-11-22 12:41:44 -06:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
ddbb5c34d4
manual mirrors
2017-11-21 14:06:28 -05:00
1dddcb5d83
Update beesease.dm
2017-11-20 22:28:29 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
52514c118a
Merge pull request #4025 from Citadel-Station-13/upstream-merge-32865
...
[MIRROR] Lets you add examine text to component decals
2017-11-20 05:08:10 +00:00
2f8d8b8729
Merge pull request #32865 from ninjanomnom/decal-examine
...
Lets you add examine text to component decals
2017-11-19 22:36:01 -06:00
808e11b414
Merge pull request #32852 from AutomaticFrenzy/patch/hud-fix
...
Fix HUDs being over-added on Login and over-removed by silicons
2017-11-19 15:16:42 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
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
a637da3b0f
Add the ability to osay from the viewvar dropdown ( #32804 )
2017-11-17 03:49:08 -06:00
43f49c74ee
[MIRROR] adds 1 gbp to armhulen's account (grammar fix) ( #3936 )
...
* adds 1 gbp to armhulen's account (grammar fix)
* Update mind.dm
* Update mind.dm
2017-11-17 00:29:40 -08: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
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
0e0eb351b3
Merge pull request #3707 from Citadel-Station-13/upstream-merge-32221
...
[MIRROR] Fixes allow_custom_shuttles default
2017-11-16 17:34:22 +00:00
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
9849b9a13b
Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482
...
[MIRROR] Improves the deep fryer
2017-11-15 11:13:56 -06:00
e7e060d83b
Merge pull request #3946 from Citadel-Station-13/upstream-merge-32692
...
[MIRROR] Adds some server tools info to getrev
2017-11-15 10:41:25 -06:00
ce0ce0b6b9
Update changeling.dm
2017-11-15 10:38:57 -06:00
c725b0d30c
Update machinery_sounds.dm
2017-11-15 10:25:34 -06:00
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
fb49013241
Merge branch 'master' into upstream-merge-32221
2017-11-14 15:59:47 -06:00
c6584399fe
Adds some server tools info to getrev ( #32692 )
2017-11-14 15:36:45 -06:00
9c7da6a133
Merge pull request #3905 from Citadel-Station-13/upstream-merge-32570
...
[MIRROR] Checks for nulls in weakrefs
2017-11-14 14:58:07 -06:00
ec2078d448
Update machinery_sounds.dm
2017-11-14 13:40:45 -06:00
e0d291eb19
Update weakrefs.dm
2017-11-14 13:06:53 -06:00
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
5591672deb
Merge pull request #3915 from Citadel-Station-13/upstream-merge-32618
...
[MIRROR] Fixes readapt removing hivemind communication.
2017-11-13 11:52:48 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
083100a4df
Merge branch 'master' into upstream-merge-32570
2017-11-13 11:45:39 -06:00
9a80e5f91c
Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582
...
[MIRROR] Fixes 512 compile reminders
2017-11-13 11:42:40 -06:00
34b3607211
Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
...
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
3e55cec1b0
Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498
...
[MIRROR] Fixes VV not displaying false values in keyed lists
2017-11-13 11:41:18 -06:00
51b0c286a9
Fixes readapt removing hivemind communication.
2017-11-13 03:20:50 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
7e6283a3f0
Merge branch 'master' into upstream-merge-32504
2017-11-12 23:11:53 -06:00
a62be6b939
Merge branch 'master' into upstream-merge-32498
2017-11-12 23:10:50 -06:00
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
deathride58