LetterJay
e52d346e7e
Merge pull request #3028 from Raeschen/master
...
Changes MIN_AGE to be in line with server rule 0
2017-09-30 12:56:20 -04:00
LetterJay
73e7fb458c
Merge pull request #3027 from Citadel-Station-13/upstream-merge-31123
...
[MIRROR] Fixes dresser being unattackable
2017-09-30 12:56:13 -04:00
LetterJay
77db385078
Merge pull request #3026 from Citadel-Station-13/upstream-merge-31158
...
[MIRROR] [s] Fixes config reading exploit
2017-09-30 12:56:04 -04:00
CitadelStationBot
3b9e2be106
Automatic changelog generation for PR #3024 [ci skip]
2017-09-30 11:55:56 -05:00
LetterJay
99712e76e9
Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
...
[MIRROR] Paper markdown
2017-09-30 12:55:53 -04:00
LetterJay
435865f23d
Merge pull request #3022 from Citadel-Station-13/upstream-merge-31098
...
[MIRROR] RegisterSignal() can now accept a list
2017-09-30 12:55:44 -04:00
LetterJay
6969777c06
Merge pull request #3020 from Citadel-Station-13/upstream-merge-31113
...
[MIRROR] Strip propriety macros from tooltips
2017-09-30 12:55:36 -04:00
LetterJay
4d87b63621
Merge pull request #3019 from Citadel-Station-13/upstream-merge-31071
...
[MIRROR] Small refactor to movement
2017-09-30 12:55:24 -04:00
Raeschen
f79ad840b2
Changes MIN_AGE to be in line with server rule 0
2017-09-30 16:30:36 +01:00
CitadelStationBot
7afdb1067f
Fixes dresser being unattackable
2017-09-30 10:30:09 -05:00
AnturK
3ec5a637e5
Fixes dresser being unattackable ( #31123 )
2017-09-30 10:30:09 -05:00
Jordan Brown
3b64e0ec35
[s] Fixes config reading exploit
2017-09-30 09:45:13 -05:00
CitadelStationBot
8c794da2de
Paper markdown
2017-09-30 08:11:01 -05:00
nicbn
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
CitadelStationBot
eb6f058e52
RegisterSignal() can now accept a list
2017-09-30 08:09:42 -05:00
Jordan Brown
08ecb0e322
RegisterSignal() can now accept a list ( #31098 )
...
* RegisterSignal may now accept a list of signals
* Update old calls to RegisterSignal()
2017-09-30 08:09:42 -05:00
CitadelStationBot
84c3161899
Strip propriety macros from tooltips
2017-09-30 08:03:28 -05:00
Tad Hardesty
20e7f03910
Strip propriety macros from tooltips ( #31113 )
2017-09-30 08:03:28 -05:00
CitadelStationBot
dc2aca9351
Small refactor to movement
2017-09-30 07:23:35 -05:00
oranges
384332fe20
Small refactor to movement ( #31071 )
...
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.
Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination
Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
2017-09-30 07:23:35 -05:00
CitadelStationBot
fceb289072
Automatic changelog generation for PR #2979 [ci skip]
2017-09-30 01:41:41 -05:00
LetterJay
e63f93979f
Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
...
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
LetterJay
69744eae23
Merge pull request #2976 from Citadel-Station-13/upstream-merge-31077
...
[MIRROR] Back and inhands for air tanks.
2017-09-30 02:41:21 -04:00
LetterJay
eb05246c8b
Update giant_spider.dm
2017-09-29 23:33:54 -05:00
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
