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
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
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
20e7f03910
Strip propriety macros from tooltips ( #31113 )
2017-09-30 08:03:28 -05:00
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
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
eb05246c8b
Update giant_spider.dm
2017-09-29 23:33:54 -05:00
e8f581bb56
Merge branch 'master' into upstream-merge-31077
2017-09-29 12:46:25 -04:00
2858c53788
Merge pull request #2958 from Michiyamenotehifunana/wave3guns
...
Wave 3 of guns
2017-09-29 12:45:52 -04:00
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
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
c80237c969
Update tank_types.dm
2017-09-29 00:48:53 -05:00
2d1d0b7fd8
Update tank_types.dm
2017-09-29 00:48:01 -05:00
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
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
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
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
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
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
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
d6a89948a2
Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078
...
[MIRROR] Cleanup operative landmarks
2017-09-29 01:44:17 -04:00
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
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
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
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
c8a03440cb
Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834
...
[MIRROR] Self replacement fix
2017-09-29 01:42:17 -04:00
8f5d02be55
Merge pull request #2977 from Citadel-Station-13/upstream-merge-31027
...
[MIRROR] GetAllContents performance increase
2017-09-29 01:41:58 -04:00
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
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
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
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
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
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
baf72b8412
Merge pull request #31064 from YPOQ/silverfriedfoods
...
Silver slime extracts create proper fried foods
2017-09-28 21:55:42 -05:00
ae604eb341
Add a fingerprint to pipes when interacted with by a wrench
2017-09-28 21:54:24 -05:00
eb27276765
Profile access is granted when holder is created
2017-09-28 21:53:12 -05:00
a01540e39b
Merge pull request #31074 from pubby/ninjaoutfit
...
Ninja outfit code cleanup
2017-09-28 21:53:05 -05:00
2309a729c7
Merge pull request #31076 from AutomaticFrenzy/elseif
...
Fix dangling #elseif in list helpers
2017-09-28 21:49:42 -05:00
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
bdae94f60c
Shooting walls can create bullet holes/dents ( #30714 )
...
* Bullet holes in walls
* Code standards, new sprite
2017-09-28 21:48:27 -05:00
1a9d36b3f1
Merge pull request #31078 from pubby/opspawn
...
Cleanup operative landmarks
2017-09-28 21:48:11 -05:00
dd7fd8b4a8
You can now light cigars on burning people ( #31081 )
...
* adds lighting cigs on burning mobs
* backslash the
* src
2017-09-28 21:46:57 -05:00
a780d6f79e
Fixes larva evolving while restrained ( #31060 )
2017-09-28 21:46:43 -05:00
724fa8ce54
[READY]Refactors timestops to use fields ( #30858 )
...
* kek
* fixes
* Fixes
* fixes
* throw freeze
* woops
* double woops
2017-09-28 21:46:34 -05:00
3c769e323e
Remove unused ninja team var
2017-09-28 21:45:02 -05:00
c6c6f67d03
Applying PDA overhaul Upstream ( #30613 )
...
* Applying PDA overhaul Upstream
Yeet?
* Used lordpidey's change
Like this?
* The build failed so I'm changing it back
* Update PDA.dm
* Update PDA.dm
* Make the settings visible only on the main screen
mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.
* Update PDA.dm
* Update PDA.dm
* Wait, I'm an idiot. I was editing the wrong thing.
* Here's your switch statements boi
* Declare font_index at the "Toggle_Font" code
I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.
* Replaced it where it was
cuz the build broke
* Make the color changer a picker instead of a field
An attempt
* Made these defines
@optimumtact @Cyberboss Like this?
2017-09-28 21:43:32 -05:00
367fcc9974
Merge pull request #30985 from tgstation/Cyberboss-patch-5
...
Fixes frozen PDAs in the game logs
2017-09-28 21:42:20 -05:00
3fe37eb41b
Secure containers give more hints, no RNG, for hacking ( #30864 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Removes bad RNG
* More instructions
* gud grammer
* Right parenthesis
* Update secure.dm
* Update secure.dm
* Update secure.dm
* less explicit
2017-09-28 21:41:07 -05:00
9b5a2f7490
Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-28 16:02:31 -05:00
d25894447e
Merge pull request #2971 from Citadel-Station-13/upstream-merge-31048
...
[MIRROR] Fixed duplicate definition
2017-09-28 12:32:57 -04:00
LetterJay