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
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
Ashe Higgs
7b3c2862d3
Stethoscope defibrillation checking ( #33234 )
2017-12-05 03:22:48 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
deathride58
507c862c7c
Update hud.dm
2017-11-28 22:24:00 -05:00
Cruix
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06: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
8d39fb9dce
merges https://github.com/tgstation/tgstation/pull/32678
2017-11-22 17:40:25 -05:00
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
deathride58
3b1067ba7a
Update pants.dm
2017-11-22 14:56:26 -05:00
deathride58
c5adadc5d1
Update engineering.dm
2017-11-22 14:54:01 -05:00
deathride58
5d2c5add1f
Update color.dm
2017-11-22 14:50:37 -05:00
deathride58
b24c9335b3
Update jobs.dm
2017-11-22 14:48:35 -05:00
deathride58
5e6e725666
Update color.dm
2017-11-22 14:47:15 -05:00
deathride58
2dbe3e3b82
Update chameleon.dm
2017-11-22 14:46:06 -05:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
Jordie
5bb8a1b962
Merge pull request #32853 from KorPhaeron/purple
...
Fixes purple bartender clothes
2017-11-19 22:55:03 -06:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00: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
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
oranges
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
LetterJay
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
oranges
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
LetterJay
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
Leo
64d0c4711f
Merge pull request #32583 from Iamgoofball/patch-334
...
Frog masks no longer have a sound
2017-11-11 14:31:37 -06:00
swindly
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
LetterJay
ea44e4a1d9
Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489
...
[MIRROR] Global vest lists
2017-11-08 02:21:36 -06:00
ShizCalev
5f5f313551
Global vest lists ( #32489 )
...
* Global vest lists
* revised coat
* Fixed duped proc
2017-11-07 23:57:57 -06:00
kevinz000
3253087a0d
Makes flightsuits far more vulnerable to EMPs ( #32430 )
2017-11-07 10:39:42 -06:00
LetterJay
0ca35e765d
Merge pull request #3842 from Citadel-Station-13/upstream-merge-32456
...
[MIRROR] [s] Removes a handful of ways ghosts can affect the world
2017-11-07 04:44:08 -06:00
oranges
1068b8f22d
Merge pull request #32456 from vuonojenmustaturska/ghostmemes
...
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
AnturK
2e0aaf8598
Ling datum antag standarization.
2017-11-05 19:32:59 -06:00
Jordan Brown
d905c9500d
Merge pull request #32418 from KorPhaeron/cloak
...
Updates cape descriptions
2017-11-05 12:03:50 -06:00
Mercenaryblue
a1532818bc
Frog masks [Feature] [ready]
2017-11-04 15:17:31 -05:00
kevinz000
f7c5196954
nerf flight vision ( #32312 )
2017-11-02 04:08:51 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
LetterJay
79d6f42dfd
conflicts
2017-10-28 01:16:26 -05:00
Emmett Gaines
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
LetterJay
20bbd77f73
Merge pull request #3549 from Citadel-Station-13/upstream-merge-31974
...
[MIRROR] Biosuits now offer high Rad resistance
2017-10-23 03:44:18 -04:00
Robustin
04b3a18502
Biosuits now offer high Rad resistance ( #31974 )
...
* Biosuit rad resistance buff
* Buffed medical hardsuit rad resist
2017-10-21 23:16:18 -05:00
Jordan Brown
d0789ecaf9
Splits clothing.dm in 7 other files
2017-10-21 19:01:30 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
