Commit Graph

5771 Commits

Author SHA1 Message Date
LetterJay
e8f581bb56 Merge branch 'master' into upstream-merge-31077 2017-09-29 12:46:25 -04:00
CitadelStationBot
7d31aa7538 Automatic changelog generation for PR #2958 [ci skip] 2017-09-29 11:45:54 -05:00
LetterJay
2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns
Wave 3 of guns
2017-09-29 12:45:52 -04:00
CitadelStationBot
cb034e0069 Automatic changelog generation for PR #2966 [ci skip] 2017-09-29 11:19:29 -05:00
LetterJay
a12df2019f Merge pull request #2966 from Citadel-Station-13/upstream-merge-31024
[MIRROR] Air tanks get their own sprite, plus reset fix.
2017-09-29 12:19:27 -04:00
LetterJay
7263926251 Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038
[MIRROR] DisplayTimeText for setup time on login
2017-09-29 12:18:25 -04:00
LetterJay
c80237c969 Update tank_types.dm 2017-09-29 00:48:53 -05:00
LetterJay
2d1d0b7fd8 Update tank_types.dm 2017-09-29 00:48:01 -05:00
LetterJay
41145b1a81 Merge pull request #3006 from Citadel-Station-13/upstream-merge-31106
[MIRROR] Removes references to gangs from tips.txt
2017-09-29 01:47:02 -04:00
LetterJay
ee0d1f15f8 Merge pull request #3001 from Citadel-Station-13/upstream-merge-31064
[MIRROR] Silver slime extracts create proper fried foods
2017-09-29 01:46:40 -04:00
LetterJay
03cdb73de9 Merge pull request #3000 from Citadel-Station-13/upstream-merge-31091
[MIRROR] Gives 1 GBP for Grammar and formatting
2017-09-29 01:46:31 -04:00
LetterJay
8762540452 Merge pull request #2999 from Citadel-Station-13/upstream-merge-31072
[MIRROR] Add a fingerprint to pipes when interacted with by a wrench
2017-09-29 01:46:14 -04:00
LetterJay
c2f6c7dbf8 Merge pull request #2998 from Citadel-Station-13/upstream-merge-31063
[MIRROR] Profile access is granted when holder is created
2017-09-29 01:46:05 -04:00
LetterJay
e4e741d924 Merge pull request #2997 from Citadel-Station-13/upstream-merge-31074
[MIRROR] Ninja outfit code cleanup
2017-09-29 01:45:54 -04:00
LetterJay
8f6b143161 Merge pull request #2995 from Citadel-Station-13/upstream-merge-31076
[MIRROR] Fix dangling #elseif in list helpers
2017-09-29 01:45:25 -04:00
LetterJay
d535514909 Merge pull request #2994 from Citadel-Station-13/upstream-merge-31061
[MIRROR] Fixes MMI buckled-warning
2017-09-29 01:45:08 -04:00
LetterJay
781b0359ae Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714
[MIRROR] Shooting walls can create bullet holes/dents
2017-09-29 01:44:54 -04:00
LetterJay
d6a89948a2 Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078
[MIRROR] Cleanup operative landmarks
2017-09-29 01:44:17 -04:00
LetterJay
1715845fe1 Merge pull request #2990 from Citadel-Station-13/upstream-merge-31081
[MIRROR] You can now light cigars on burning people
2017-09-29 01:43:59 -04:00
LetterJay
1c66327f3d Merge pull request #2989 from Citadel-Station-13/upstream-merge-31059
[MIRROR] Fixes omega air injector
2017-09-29 01:43:21 -04:00
LetterJay
75359598b3 Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060
[MIRROR] Fixes larva evolving while restrained
2017-09-29 01:43:07 -04:00
LetterJay
80e92ebdc5 Merge pull request #2987 from Citadel-Station-13/upstream-merge-30858
[MIRROR] [READY]Refactors timestops to use fields
2017-09-29 01:42:56 -04:00
LetterJay
3c608b3ad4 Merge pull request #2986 from Citadel-Station-13/upstream-merge-31079
[MIRROR] Remove unused ninja team var
2017-09-29 01:42:31 -04:00
LetterJay
c8a03440cb Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834
[MIRROR] Self replacement fix
2017-09-29 01:42:17 -04:00
LetterJay
8f5d02be55 Merge pull request #2977 from Citadel-Station-13/upstream-merge-31027
[MIRROR] GetAllContents performance increase
2017-09-29 01:41:58 -04:00
LetterJay
cef4ae4fd6 Merge pull request #2975 from Citadel-Station-13/upstream-merge-30661
[MIRROR] Advanced camera consoles use a list for z lock rather than a single z level
2017-09-29 01:41:32 -04:00
LetterJay
02a5c92233 Merge pull request #2974 from Citadel-Station-13/upstream-merge-31046
[MIRROR] AFK players count as dead for the assassinate objective
2017-09-29 01:41:16 -04:00
LetterJay
595f2cb08f Merge pull request #2983 from Citadel-Station-13/upstream-merge-30985
[MIRROR] Fixes frozen PDAs in the game logs
2017-09-29 01:39:50 -04:00
LetterJay
4af02dff06 Merge pull request #2984 from Citadel-Station-13/upstream-merge-30613
[MIRROR] Applying PDA overhaul Upstream
2017-09-29 01:39:28 -04:00
LetterJay
157d9cc6e6 Merge pull request #2982 from Citadel-Station-13/upstream-merge-30864
[MIRROR] Secure containers give more hints, no RNG, for hacking
2017-09-29 01:39:03 -04:00
LetterJay
0d66bfed43 Merge pull request #3004 from Citadel-Station-13/upstream-merge-31110
[MIRROR] Stops revheads from being metagamed with healthscanners & medical HUDs.
2017-09-29 01:38:20 -04:00
CitadelStationBot
0bcf7335c0 Removes references to gangs from tips.txt 2017-09-28 22:28:04 -05:00
oranges
183c158d14 Merge pull request #31106 from DaxDupont/puttheclownupsidedown
Removes references to gangs from tips.txt
2017-09-28 22:28:04 -05:00
CitadelStationBot
1c308b6d81 Stops revheads from being metagamed with healthscanners & medical HUDs. 2017-09-28 22:00:17 -05:00
ShizCalev
9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110)
* Stops revheads metagaming

* Added comment.
2017-09-28 22:00:16 -05:00
CitadelStationBot
e8421c8a9c Silver slime extracts create proper fried foods 2017-09-28 21:55:42 -05:00
oranges
baf72b8412 Merge pull request #31064 from YPOQ/silverfriedfoods
Silver slime extracts create proper fried foods
2017-09-28 21:55:42 -05:00
CitadelStationBot
e58558b482 Gives 1 GBP for Grammar and formatting 2017-09-28 21:55:35 -05:00
oranges
f508d248be Merge pull request #31091 from tgstation/Cyberboss-patch-1
Gives 1 GBP for Grammar and formatting
2017-09-28 21:55:35 -05:00
CitadelStationBot
5dc39d5984 Add a fingerprint to pipes when interacted with by a wrench 2017-09-28 21:54:24 -05:00
oranges
ae604eb341 Add a fingerprint to pipes when interacted with by a wrench 2017-09-28 21:54:24 -05:00
CitadelStationBot
57771d4dc0 Profile access is granted when holder is created 2017-09-28 21:53:13 -05:00
Jordan Brown
eb27276765 Profile access is granted when holder is created 2017-09-28 21:53:12 -05:00
CitadelStationBot
ebfb2e8252 Ninja outfit code cleanup 2017-09-28 21:53:05 -05:00
oranges
a01540e39b Merge pull request #31074 from pubby/ninjaoutfit
Ninja outfit code cleanup
2017-09-28 21:53:05 -05:00
CitadelStationBot
2ce1d60147 Fix dangling #elseif in list helpers 2017-09-28 21:49:42 -05:00
oranges
2309a729c7 Merge pull request #31076 from AutomaticFrenzy/elseif
Fix dangling #elseif in list helpers
2017-09-28 21:49:42 -05:00
CitadelStationBot
cda9542c1c Fixes MMI buckled-warning 2017-09-28 21:48:35 -05:00
kingofkosmos
977163ae54 Fixes MMI buckled-warning (#31061)
* Fixes MMI having a buckled-warning when trying to move.

* Comment added.
2017-09-28 21:48:35 -05:00
CitadelStationBot
a10d693ee6 Shooting walls can create bullet holes/dents 2017-09-28 21:48:27 -05:00